1949 files changed, 105479 insertions, 127984 deletions

diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index 998fc74..f35548c 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -1,1125 +1,1124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Fuldt navn</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Vælg</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kort</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Start søgning</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Luk find</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Skriv mail til</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation>Send postering</translation>
+        <translation>Send kontakt</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Gem alle data</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Indstilling</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Korrekt fil-type?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Den valgte fil 
  slutter ikke med &quot;.vcf&quot;.
  Er du sikker på du vil åbne den?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nej</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Tilføj kontakt?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Er du sikker på du vil tilføje kontakten for %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Alle ja</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Rediger adresse</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Rediger mine personlige detaljer</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakter - Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere lager</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Kunne ikke gemme information.
 Frigør noget lagerplads
 og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ikke fundet</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>Kunne ikke finde en kontakt med
 dette søge mønster!</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kort</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal vælge en kontakt!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation type="unfinished"></translation>
+        <translation>Du skal angive et filnavn!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Søge indstillinger</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>Forespørgsels metode</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Brug regulære udtryk</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Brug wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Lille</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Foretræk QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Foretræk Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Bemærk: QT-Mail kan
 kun fås fra SHARP
 standard ROM&apos;en.
 Opie-Mail fås gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Rækkefølge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Vælg kontakt rækkefølgen:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Op</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik på fanen for at vælge den</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Indstilling af søge metoder</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Søgefunktionen forventer regulære udtryk hvis denne er valgt</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Søgefunktionen forventer kun simple wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Hvis valgt, skelner søgningen mellem store og små bogstaver</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Skrift størrelse for liste og kort visning</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Skrift indstillinger for liste og kort visning</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Brug Sharp&apos;s mail program hvis det er tilgengæligt</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Brug OPIE mail hvis det er installeret</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Flyt den valgte attribut en linie op</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Flyt den valgte attribut en linie ned</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste over alle mulige attributter</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Tilføj den valgte attribut fra listen herunder til den øverste liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Fjern den valgte attribut fra den øverste liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Rækkefølge (op -&gt; ned) definerer den primære kontakt vist i den anden kolonne i listen</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Værktøjs-/Menulinje</translation>
     </message>
     <message>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>Faste</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift til faste menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
     <message>
         <source>Moveable</source>
-        <translation type="unfinished"></translation>
+        <translation>Flytbare</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Skift til flytbare menu-/værktøjslinjer efter programmet er genstartet!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>Fuldt navn...</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Noter...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generel</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjem</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>By</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postnummer</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>USA</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Storbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeriet</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikansk Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Østrig</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Hviderusland</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetø</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Cayman-øerne</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kina</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Juleøen</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cookøerne</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Elfenbenskysten</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatien</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cypern</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tjekkiske Republik</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danmark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanske Republik</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Østtimor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypten</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Ækvatorialsk Guinea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopien</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falklandsøerne</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Færøerne</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finland</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankrig</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Fransk Guyana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Fransk Polynesien</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Tyskland</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grækenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grønland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vatikanstaten</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungarn</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Island</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indien</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesien</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Kuwait</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Letland</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litauen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxembourg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedonien</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldiverne</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritanien</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronesien</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongoliet</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holland</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Ny Kaledonien</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>New Zealand</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norge</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Ny Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippinerne</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumænien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>St. Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi-Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellerne</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakiet</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-øerne</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Sydafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Sverige</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index a4acd22..b052825 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -1,315 +1,377 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Mappen eksisterer ikke</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Skift mappe</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Kør</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Åben som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Opret mappe</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Opret genvej</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Omdøb</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopier som</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopier samme mappe</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Flyt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Tilføj til dokumenter</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Kør kommando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Fil info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Indstil rettigheder</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Send fil</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
-        <translation>AdvancedFm</translation>
+        <translation>Filstyring</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Kør kommando med output</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Vælg alle</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Skift til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Skift til ekstern</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Vil du slette
 %1 filer?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Slet mappe?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Slet
-</translation>
-    </message>
-    <message>
         <source>Could not rename</source>
         <translation>Kunne ikke omdøbe</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>Vil du kopiere
 %1 filer?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Filen eksisterer!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Kunne ikke kopiere
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>til
 </translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Som</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Kunne ikke flytte
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
-        <translation>AdvancedFm Output</translation>
+        <translation>Filstyring Output</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation>Advancedfm send ud</translation>
+        <translation>Filstyring send</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir sendt.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> eksisterer allerede.
 Vil du slette den?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 eksisterer. Overskriv?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Kunne ikke kopiere %1 til %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation type="unfinished">Advanced FileManager
+        <translation>Advanced FileManager
 er copyright 2002-2003 af
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 og er licenseret som GPL</translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation>Bogmærk mappe</translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation>Fjern den aktuelle mappe fra bogmærker</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fejl</translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
-        <translation type="unfinished"></translation>
+It is not bookmarked!</source>
+        <translation>Kan ikke fjerne den aktuelle mappe
+fra bogmærker.
+Den er ikke bogmærket!</translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
-        <translation type="unfinished"></translation>
+        <source>File Search</source>
+        <translation>Filsøgning</translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Vil du slette %1
+og alt hvad der er i den?</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete
+%1?</source>
+        <translation>Vil du slette
+%1?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">Filstyring :: </translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete">kB ledig</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">Kopier &apos;%1&apos; som</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gem output i filen (kun navn)</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Processen kunne ikke starte</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Fejl
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Afsluttet
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Indstil fil-rettighederne</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Indstil fil-rettighederne for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>ejer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Ejer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>læse</translation>
     </message>
     <message>
         <source>write</source>
         <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>køre</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Fejl- ingen bruger</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Fejl- ingen gruppe</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Der opstod fejl under indstilling af ejerforhold</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Der opstod fejl under indstilling af rettigheder</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/appearance.ts b/i18n/da/appearance.ts
index 90bf226..678507d 100644
--- a/i18n/da/appearance.ts
+++ b/i18n/da/appearance.ts
@@ -1,285 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Indstillinger...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Nuværende skema</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Redigér...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Tving stilændring for alle programmer.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation>Fravælg stilændring for disse programmer ( &lt;b&gt;*&lt;/b&gt; kan bruges som wildcard):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>Binær(e) fil(er)</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Fane stil:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Faner</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Faner m. ikoner</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Drop-down liste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Drop-down liste m. ikoner</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Top</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bund</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farver</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Genstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation>Vil du genstarte %1 nu?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Gem skema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Gem skema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Skemaet eksisterer allerede.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Slet skema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kan ikke slette nuværende skema.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;ny&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Stil-arter styrer den måde elementer så som knapper og rullebjælker vises i alle programmer.
 
 Klik her for at vælge en tilgængelig stilart.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klik her for at konfigurere den nuværende valgte stil-art.
 
 Note: Denne mulighed er ikke tilgængelig ved alle stil-arter.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vindues udsmykninger styrer måden som program titelbjælken og dens knapper vises.
 
 Klik her for at vælge en tilgængelig udsmykning.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Vælg det ønskede navn, stil-art og størrelse af den standard skrifttype programmerne skal bruge.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Farveskemaer er en samling af farver som bruge til forskellige dele af skærmen.
 
 Klik her for at vælge et tilgængeligt skema.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klik her for at skifte farverne i det nuværende farveskema.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klik her for at slette det valgte farveskema i listen til venstre.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klik her for at navngive og gemme det nuværende farveskema.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
         <translation>Klik her for at lade alle programmer bruge de globale udseende indstillinger.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>Hvis nogle programmer ikke vises korrekt med de globale udseende indstillinger kan visse features slås fra for det pågældende program.
 
 Dette område lader dig vælge et program og hvilke indstillinger to vil slå fra.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
         <translation>Klik her for at tilføje et program til listen ovenover.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
         <translation>Klik her for at slette det nuværende valgte program.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
         <translation>Klik her for at flytte det nuværende valgte program opad i listen.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
         <translation>Klik her for at flytte det nuværende valgte program nedad i listen.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klik her for at vælge en stil-art til fane-dialogvinduer (såsom dette program). De mulige stil-arter er::
 
 1. Faner - standard faner, kun med tekst mærkater
 2. Faner m. ikoner - faner med et ikon for hver fane, tekst mærkat vises kun på den valgte fane
 3. Drop-down liste - en lodret liste af faner
 4. Drop-down liste m. ikoner - en lodret liste af faner med ikoner</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik her så faner vises øverst i vinduet.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik her så faner vises nederst i vinduet.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dette er et eksempel vindue. Brug dette til at se det nye udseende når du ændrer på indstillingerne.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Udseende indstillinger</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotationsretning:</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Redigér skema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik her for at vælge en farve til: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Eksempel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalt element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Deaktiveret element</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normal tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Valgt tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knap</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Afkrydsningsfelt</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Eksempel vindue ved brug af de nuværende indstillinger.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/appskey.ts b/i18n/da/appskey.ts
deleted file mode 100644
index 89f3193..0000000
--- a/i18n/da/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Vælg Program Tast</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Kalender</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Adressebog</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Hjem</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Popop Menu</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Post</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/aqpkg.ts b/i18n/da/aqpkg.ts
index 3adc940..c37a958 100644
--- a/i18n/da/aqpkg.ts
+++ b/i18n/da/aqpkg.ts
@@ -1,590 +1,692 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished">Kategori filter</translation>
+        <translation>Kategorifilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg én eller flere grupper</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Læser konfiguration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Afbryd</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Installer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Opgrader</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Geninstaller)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Opgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished">Destination</translation>
+        <translation>Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished">Ledig plads</translation>
+        <translation>Ledig plads</translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished">Output</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Start</translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Indstillinger</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Afbryd</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Brugeren klikkede AFBRYD ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Process afbrudt ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gem output</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukendt</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished">--force-depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished">--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished">--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished">--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationsniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Kun fejl</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Almindelige meddelelser</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Oplysende meddelelser</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
+        <translation>Meddelelser til fejlfinding</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished">Håndterer pakken %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Fjerner symbolske links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished">Laver symlinks til%1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished">Laver symlinks til %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Færdig</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Opretter mappe</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Link fra %1 til %1 oprettet</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>%1 fjernet</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Kunne ikke fjerne %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Fjernet</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakkestyring</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Indtast teksten du vil søge efter her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik her for at gemme Quick Jump værktøjslinien.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Opdatér lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik her for at opdatere pakke lister fra serverne.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Opgradér</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik her for at opgradere alle installerede pakker, hvis en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik her for at hente den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Anvend ændringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik her for at installere, fjerne eller opgradere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Vis pakker der ikke er installeret</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik her for at vise de tilgængelige pakker der ikke er installeret.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Vis installerede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Vis opdaterede pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik her for at vise de pakker der er installeret på denne enhed, hvor en nyere version er tilgængelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrér efter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik her for at vise pakker tilhørende en bestemt kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Vælg filter kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik her for at ændre den kategori der skal bruges til filteret.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik her for at søge efter tekst i pakke navnene.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Find næste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik her for at finde det næste pakke navn indeholdende den tekst du søger efter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump tastplade</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik her for at vise/skjule tastpladen for hurtig søgning i pakke listen.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurér</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik her for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Klik her for at skjule søge værktøjslinien.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik her for at vælge et pakke feed.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dette er en liste over alle pakker fra det server feed der er valgt foroven.
 
 En blå prik ved siden af pakke navnet indikerer at pakken allerede er installeret.
 
 En blå prik med en stjerne indikerer at en nyere version af pakken er tilgængelig fra det valgte server feed.
 
 Klik inde i boksen til venstre for at vælge en pakke.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik her for at afinstallere den/de valgte pakke(r).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bygger server liste:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bygger pakke liste for:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Installeret på - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Beskrivelse - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Størrelse - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Sektion - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Filnavn - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">V. installeret - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">V. tilgængelig - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Genopfrisker server pakke lister</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ADVARSEL: Opgradering mens
 Opie/Qtopia kører
 er IKKE anbefalet!
 
 Er du sikker?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Opgraderer installerede pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Er du sikker på du vil slette
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Hent hvortil</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Indtast stien der skal hentes til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installér fjernpakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Indtast pakkens lokation</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Intet at lave</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Ingen pakker er valgt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Vil du fjerne eller geninstallere
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Fjern eller geninstallér</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Geninstallér</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vil du fjerne eller opgradere
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Fjern eller opgradér</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opdaterer Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Beskrivelse&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;&lt;b&gt;Installeret i&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Version installeret&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Version tilgængelig&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakkeinformation</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakkeinformation er ikke tilgængelig</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Luk</translation>
+        <translation>Luk</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Installerede pakker</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Lokale pakker</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Pakke - %1 version - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished">Konfiguration</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished">Servere</translation>
+        <translation>Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished">Destinationer</translation>
+        <translation>Destinationer</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished">Proxyer</translation>
+        <translation>Proxyer</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished">Ny</translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Navn:</translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Aktive servere</translation>
+        <translation>Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Opdater</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished">Destination</translation>
+        <translation>Destination</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Placering:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished">HTTP Proxy</translation>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">Aktiveret</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished">FTP Proxy</translation>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Brugernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodeord:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/backgammon.ts b/i18n/da/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/da/backgammon.ts
+++ b/i18n/da/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/backup.ts b/i18n/da/backup.ts
index c79850a..d5951af 100644
--- a/i18n/da/backup.ts
+++ b/i18n/da/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Sikkerhedskopiering... arbejder...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>Fejl! Der er ikke taget backup.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Detaljer</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Backup gennemført.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Kunne ikke åbne filen %1</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiering</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programmer</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiering</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Gendan</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Vælg kilde</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Column 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Gendan</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Opdater fil-listen</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/bounce.ts b/i18n/da/bounce.ts
index 12c782b..d70ae91 100644
--- a/i18n/da/bounce.ts
+++ b/i18n/da/bounce.ts
@@ -1,107 +1,123 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Bounce</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nyt spil</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spil</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Point: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Liv: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Fyldt: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Tid: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Bounce niveau %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Point: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Spillet er pauset.
 Tryk P for at fortsætte!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>Game Over!
 Point: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Tid: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Liv: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Fyldt: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Fyldt: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Tillykke. Du har fyldt mere end 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 point: 15 point pr. liv
 </translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 point: Bonus
 </translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 point: I alt
 </translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>Videre til niveau %1.
 Du får %2 liv denne gang!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/calibrate.ts b/i18n/da/calibrate.ts
new file mode 100644
index 0000000..901d8d6
--- a/dev/null
+++ b/i18n/da/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Tryk præcist og bestemt på krydsene
+for at kalibrere skærmen.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Velkommen til Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/checkbook.ts b/i18n/da/checkbook.ts
index 2851c82..c105c18 100644
--- a/i18n/da/checkbook.ts
+++ b/i18n/da/checkbook.ts
@@ -1,505 +1,524 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt checkhæfte</translation>
     </message>
     <message>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Information</translation>
     </message>
     <message>
         <source>Transactions</source>
-        <translation type="unfinished"></translation>
+        <translation>Transaktioner</translation>
     </message>
     <message>
         <source>Charts</source>
-        <translation type="unfinished"></translation>
+        <translation>Diagrammer</translation>
     </message>
     <message>
         <source>Password protect</source>
-        <translation type="unfinished"></translation>
+        <translation>Beskyttet med kodeord</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at slå beskyttelse med kodeord til eller fra.</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv navnet på checkhæftet her.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg checkhæfte-typen her.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation type="unfinished"></translation>
+        <translation>Opsparinger</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Regninger</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation type="unfinished"></translation>
+        <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation type="unfinished"></translation>
+        <translation>Pengemarkedet</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
+        <translation>Fælleskapital</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Andet</translation>
     </message>
     <message>
         <source>Bank:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv checkhæftets banks navn her.</translation>
     </message>
     <message>
         <source>Account number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontonummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv kontonummer for checkhæftet her.</translation>
     </message>
     <message>
         <source>PIN number:</source>
-        <translation type="unfinished"></translation>
+        <translation>PIN kode:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv checkhæftets pinkode her.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
+        <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv checkhæftets startsaldo her.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv yderligere informationer for checkhæftet her.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuværende saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Her vises checkhæftets nuværende saldo.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette er en liste med alle checkhæftets transaktioner.
+
+For at sortere efter en kolonne, klik på kolonnens navn.</translation>
     </message>
     <message>
         <source>Num</source>
-        <translation type="unfinished"></translation>
+        <translation>No</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation type="unfinished"></translation>
+        <translation>Beløb</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tilføje en ny transaktion.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg en transaktion, og klik her for at redigere den.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg et checkhæfte og klik her for at slette det.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg det ønskede diagram herunder, og klik på Tegn-knappen.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge diagram-typen.</translation>
     </message>
     <message>
         <source>Account balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontoens saldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Udtrækninger efter kategori</translation>
     </message>
     <message>
         <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Indsættelser efter kategori</translation>
     </message>
     <message>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tegne det valgte diagram.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuværende saldo: %1%2</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv venligst dit kodeord:</translation>
     </message>
     <message>
         <source>Confirm password</source>
-        <translation type="unfinished"></translation>
+        <translation>Bekræft kodeord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bekræft dit kodeord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv dit kodeord for at bekræfte, at du vil slå kodeordsbeskyttelse fra:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet transaktion</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurer Checkhæfte</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv valutasymbol:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv symbolet for den lokale valuta her (fx. kr).</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis om checkhæftet er beskyttet med
+kodeord</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge, om hovedvinduet skal vise, om checkhæftet er beskyttet med kodeord.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis checkhæfte-saldi</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge om hoved-vinduet skal vise den nuværende saldo for hver checkhæfte.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at oprette et nyt checkhæfte.
+
+Du kan også vælge Nyt fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg et checkhæfte, og klik her for at redigere det.
+
+Du kan også vælge Rediger fra Checkhæfte-menuen, eller klikke og holde nede på et checkhæftes navn.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg et checkhæfte, og klik her for at slette det.
+
+Du kan også vælge Slet fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik er for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette er en liste over tilgængelige checkhæfter.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Checkhæfte-navn</translation>
     </message>
     <message>
         <source>Balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv dit kodeord:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet checkhæfte</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
-        <translation type="unfinished"></translation>
+        <translation>Transaktion for</translation>
     </message>
     <message>
         <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
+        <translation>Udtrækning</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg om transaktionen er et udtræk eller en indsættelse.</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation type="unfinished"></translation>
+        <translation>Indsættelse</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg transaktionens dato her.</translation>
     </message>
     <message>
         <source>Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummber:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv check-nummer her.</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv en beskrivelse af transaktionen her.</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg en transaktions-kategori her.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg transaktionstypen her.
+
+De tilgængelige valgmuligheder er ud fra om det er en indsætning eller en udtrækning.</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation type="unfinished"></translation>
+        <translation>Beløb:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv beløbet her.
+
+Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebyr:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv eventuelt gebyr for transaktionen.
+
+Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv evt. ekstra informationer om transaktionen her.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Bil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation type="unfinished"></translation>
+        <translation>Regninger</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation type="unfinished"></translation>
+        <translation>CD&apos;er</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Tøj</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation type="unfinished"></translation>
+        <translation>DVD&apos;er</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Electronics</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation type="unfinished"></translation>
+        <translation>Underholdning</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation type="unfinished"></translation>
+        <translation>Mad</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation type="unfinished"></translation>
+        <translation>Benzin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Diverse</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation type="unfinished"></translation>
+        <translation>Film</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation type="unfinished"></translation>
+        <translation>Leje</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation type="unfinished"></translation>
+        <translation>Rejser</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Udskrevet check</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Overførsel</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Kreditkort</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation type="unfinished"></translation>
+        <translation>Arbejde</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation type="unfinished"></translation>
+        <translation>Familiemedlem</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
+        <translation>Diverse kredit</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisk betaling</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontant</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Elektronik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/clock.ts b/i18n/da/clock.ts
index c6df4c1..4fb1f28 100644
--- a/i18n/da/clock.ts
+++ b/i18n/da/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Udsæt</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Ur</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Stopur</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Nulstil</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Indstil alarmen</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Indstil dato og tid.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarmen er tændt</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarmen er slukket</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Ur: Alarmen blev overhørt.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarmen er indstillet: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Indstil Alarmen</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Time</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minut</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>MP3 Alarm</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Udsættelse
 (minutter)</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 6a3c742..9833180 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -1,811 +1,803 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Uge liste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Begivenhedens varighed er
 potientielt længere end
 intervallet mellem gentagelserne.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data, synkronisering er igang</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Rediger begivenhed</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutter)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender kunne ikke gemme
 dine ændringer.
 Frigør noget lagerplads og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ukendt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fejl!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ret</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Fortsæt</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier begivenhed</translation>
     </message>
     <message>
         <source>Edit...</source>
+        <translation>Rediger...</translation>
+    </message>
+    <message>
+        <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>O</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>L</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tid</translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier</translation>
+    </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Send denne begivenhed</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished">Kalender</translation>
+        <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start visning af begivenheder</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Start tid:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarm indstillinger</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarm forvalg</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Række stil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
     </message>
     <message>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>Visninger</translation>
     </message>
     <message>
         <source>Default view:</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard visning:</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Dag</translation>
+        <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Uge</translation>
+        <translation>Uge</translation>
     </message>
     <message>
         <source>Week List</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugeliste</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Måned</translation>
+        <translation>Måned</translation>
     </message>
     <message>
         <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå til dags dato</translation>
     </message>
     <message>
         <source>Time display</source>
-        <translation type="unfinished"></translation>
+        <translation>Klokketslet for</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Ingen</translation>
+        <translation>Ingen</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Start</translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
-        <translation type="unfinished"></translation>
+        <translation>Start-slut</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardindstillinger</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sted:</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">Kontor</translation>
+        <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished">Hjemme</translation>
+        <translation>Hjemme</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategori:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>MTOTFLSM</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>U: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation>M</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation>T</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation>O</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation>T</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation>F</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation>L</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation>S</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Start tid</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Slut tid</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Gentag...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagligt...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Ugentligt...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Månedetligt...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Årligt...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Ny begivenhed</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Møde</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Frokost</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Middag</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Rejse</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Slut</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Start tid</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tidszone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Lydløs</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Gentag</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Bemærkning...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Rediger bemærkning</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Frokost</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>D. %1 hver </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>D. %1 %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ingen gentagelse</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Gentag hver</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>måned(er)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>år</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>uger</translation>
     </message>
     <message>
         <source>week</source>
         <translation>uge</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source> and </source>
         <translation> og </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 og </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, og </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>på</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Slut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Gentagelse aktiveret</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>måneder</translation>
     </message>
     <message>
         <source>years</source>
         <translation>år</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/drawpad.ts b/i18n/da/drawpad.ts
index ab1ca77..3d6dc26 100644
--- a/i18n/da/drawpad.ts
+++ b/i18n/da/drawpad.ts
@@ -1,435 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet alle</translation>
     </message>
     <message>
         <source>Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer</translation>
     </message>
     <message>
         <source>Import...</source>
-        <translation type="unfinished"></translation>
+        <translation>Importer...</translation>
     </message>
     <message>
         <source>Export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Eksporter</translation>
     </message>
     <message>
         <source>Export...</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter...</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Miniaturevisning</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
+        <translation>Miniaturevisning...</translation>
     </message>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Sideinformation</translation>
     </message>
     <message>
         <source>Page Information...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sideinformation...</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Anti-Alias</translation>
     </message>
     <message>
         <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <translation>Værktøjer</translation>
     </message>
     <message>
         <source>New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny side</translation>
     </message>
     <message>
         <source>Clear Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Tøm side</translation>
     </message>
     <message>
         <source>Delete Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet side</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortryd</translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Gendan</translation>
     </message>
     <message>
         <source>First Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Første side</translation>
     </message>
     <message>
         <source>Previous Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Forrige side</translation>
     </message>
     <message>
         <source>Next Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Næste side</translation>
     </message>
     <message>
         <source>Last Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Sidste side</translation>
     </message>
     <message>
         <source>Draw Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn prik</translation>
     </message>
     <message>
         <source>Draw Line</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn linje</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn rektangel</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn fyldt rektangel</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn ellipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegn fyldt ellipse</translation>
     </message>
     <message>
         <source>Insert Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Indsæt tekst</translation>
     </message>
     <message>
         <source>Fill Region</source>
-        <translation type="unfinished"></translation>
+        <translation>Fyld område</translation>
     </message>
     <message>
         <source>Erase Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet prik</translation>
     </message>
     <message>
         <source>Pen Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Pen bredde</translation>
     </message>
     <message>
         <source>Pen Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Pen farve</translation>
     </message>
     <message>
         <source>Fill Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Fyld farve</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du tømme
+denne side?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nej</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du slette
+denne side?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du slette
+alle sider?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tilføje en ny side.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tømme denne side.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at slette denne side.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Klik her for at fortryde sidste hændelse.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Klik her for at gendanne sidste hændelse.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at se den første side.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at se den forrige side.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at se den næste side.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at se den sidste side.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge et af de tilgængelige værktøjer til at tegne streger.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge et af de tilgængelige værktøjer til at tegne rektangler.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge et af de tilgængelige værktøjer til at tegne ellipser.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge tekst-værktøjet.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge fyld-værktøjet.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge slette-værktøjet.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at være bredden på tegne-pennen.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge tegne-farven.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at vælge fyld-farven.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegneblok - Side %1 af %2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegneblok - Eksporter</translation>
     </message>
     <message>
         <source>Page Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Sidevalg</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Current</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktuelle</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation type="unfinished"></translation>
+        <translation>Række</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Til:</translation>
     </message>
     <message>
         <source>Export As</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter som</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <source>Format:</source>
+        <translation>Format:</translation>
+    </message>
+    <message>
+        <source>All Images</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegneblok - Importer</translation>
     </message>
     <message>
         <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Automatisk preview</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Alle billeder</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny side</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Generelt</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Titel:</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bredde:</translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>Højde:</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Baggrund</translation>
     </message>
     <message>
         <source>White</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvid</translation>
     </message>
     <message>
         <source>Pen Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Pen-farve</translation>
     </message>
     <message>
         <source>Fill Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Fyld-farve</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Sideinformation</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Generelt</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Titel:</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato:</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bredde:</translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>Højde:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Titel: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Indsæt tekst</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegneblok - Miniaturevisning</translation>
     </message>
     <message>
         <source>Clear Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Tøm side</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du tømme den
+valgte side?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nej</translation>
     </message>
     <message>
         <source>Delete Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet side</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du slette den
+valgte side?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tilføje en ny side.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at tømme denne side.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at slette denne side.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at flytte den valgte side én position op i listen.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klik her for at flytte den valgte side én position ned i listen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/euroconv.ts b/i18n/da/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/da/euroconv.ts
+++ b/i18n/da/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/filebrowser.ts b/i18n/da/filebrowser.ts
deleted file mode 100644
index a7e2016..0000000
--- a/i18n/da/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/formatter.ts b/i18n/da/formatter.ts
index 751e732..b1fd5b4 100644
--- a/i18n/da/formatter.ts
+++ b/i18n/da/formatter.ts
@@ -1,161 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
+        <source>Card mount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card mount failed!</source>
+        <source>You can now close the output window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
+        <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You can now close the output window.</source>
+        <source>Total: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal</source>
+        <source>Used: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage Type : </source>
+        <source>Available: %1 kB ( %d mB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
+        <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available: %1 kB ( %d mB)</source>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/go.ts b/i18n/da/go.ts
index 07e1e03..9a2fab5 100644
--- a/i18n/da/go.ts
+++ b/i18n/da/go.ts
@@ -1,56 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt spil</translation>
     </message>
     <message>
         <source>Pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resign</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Two player option</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Spil</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
+        <translation>Hvid %1, Sort %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvid vinder.</translation>
     </message>
     <message>
         <source>Black wins.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sort vinder.</translation>
     </message>
     <message>
         <source>A draw.</source>
-        <translation type="unfinished"></translation>
+        <translation>Uafgjort.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Fanger: Sort %1, hvid %2</translation>
     </message>
     <message>
         <source>Go</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/helpbrowser.ts b/i18n/da/helpbrowser.ts
index fdda86d..cd59cac 100644
--- a/i18n/da/helpbrowser.ts
+++ b/i18n/da/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Tilbage</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Frem</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjem</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Tilføj bogmærke</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Fjern fra bogmærker</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Bogmærker</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Hjælpesøger</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>Hjælpesøger</translation>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/kbill.ts b/i18n/da/kbill.ts
index f4d45dd..22f0fd9 100644
--- a/i18n/da/kbill.ts
+++ b/i18n/da/kbill.ts
@@ -1,64 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
-        <translation type="unfinished"></translation>
+        <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt spil</translation>
     </message>
     <message>
         <source>Pause game</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
+        <translation>Historien bag kBill</translation>
     </message>
     <message>
         <source>Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Regler</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fil</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source>Pause Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Historien&lt;/b&gt;&lt;p&gt;Endnu engang ligger verdenens skæbte i dine hænder! En ond hacker, kun kendt som &quot;Bill&quot;, har skabt den ultimative computervirus. En virus så magtfuld, at den kan lave en almindelig computer til en toaster. (Argh!) &quot;Bill&quot; har klonet sig selv til en million milliard micro-udgaver. Deres eneste formål er at sprede den afskyelige virus, som smart nok er forklædt som et populært operativsystem. Som systemadministrator og desinfektør er det dit arbejde, at sørge for at Bills mission mislykkes.</translation>
     </message>
     <message>
         <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
+        <translation>Historien bag KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
+        <translation>KBills regler</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;b&gt;Reglerne&lt;/b&gt;&lt;p&gt;kBill er omhyggeligt designet til at være lige så let at bruge for hele familien, som for lille Sally. Betatesting i årevis - næh - dagevis og eksperthjælp fra de billigste brugerfladedesignere har givet et spil der er let at bruge, men alligevel ikke minder om en Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Tæsk en Bill (klik)&lt;/LI&gt;&lt;LI&gt;Genstart en computer (klik)&lt;/LI&gt;&lt;LI&gt;Saml et stjålet OS op og flyt det tilbage (træk) til computeren&lt;/LI&gt;&lt;LI&gt;Træk spanden for at fjerne gnister&lt;/LI&gt;&lt;LI&gt;Point er baseret på den totale oppetid, med bonus for at dræbe Bill-kloner.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Resten kan du nok selv regne ud. Vi gjorde, så det skulle ikke være så svært</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Efter bane</translation>
     </message>
     <message>
         <source>Your score</source>
-        <translation type="unfinished"></translation>
+        <translation>Point</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/kcheckers.ts b/i18n/da/kcheckers.ts
index ebf2980..b06cc0b 100644
--- a/i18n/da/kcheckers.ts
+++ b/i18n/da/kcheckers.ts
@@ -1,129 +1,129 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KCheckers</name>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nyt</translation>
     </message>
     <message>
         <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fortryd</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Afslut</translation>
     </message>
     <message>
         <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Begynder</translation>
     </message>
     <message>
         <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Øvet</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Gennemsnitlig</translation>
     </message>
     <message>
         <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">God</translation>
     </message>
     <message>
         <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ekspert</translation>
     </message>
     <message>
         <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Mester</translation>
     </message>
     <message>
         <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Vis numerering</translation>
     </message>
     <message>
         <source>&amp;English Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Russian Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Green Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Marble Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Wooden Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s This</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Spilleregler</translation>
     </message>
     <message>
         <source>&amp;About KCheckers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Spil</translation>
     </message>
     <message>
         <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;værhedsgrad</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Indstillinger</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source> New Game </source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt spil</translation>
     </message>
     <message>
         <source> Undo Move </source>
-        <translation type="unfinished"></translation>
+        <translation>Fortryd træk</translation>
     </message>
     <message>
         <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
+        <translation>Spilleregler</translation>
     </message>
     <message>
         <source>Go!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tillykke! Du vandt!</translation>
     </message>
     <message>
         <source>Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vent venligst...</translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
+        <translation>Du har tabt. Spillet er slut.</translation>
     </message>
     <message>
         <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forkert rute</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/kpacman.ts b/i18n/da/kpacman.ts
index fb73268..1004156 100644
--- a/i18n/da/kpacman.ts
+++ b/i18n/da/kpacman.ts
@@ -1,232 +1,223 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Okay</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardindstillinger</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortryd</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Ændre retningsknapper</translation>
     </message>
     <message>
         <source>Undefined key</source>
-        <translation type="unfinished"></translation>
+        <translation>Udefineret knap</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nyt</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rangliste</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Afslut</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gem musepil</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ændre &amp;knapper...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hjælp</translation>
     </message>
     <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
+        <translation>SPILLET ER SLUT</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
+        <translation>SPILLER ET</translation>
     </message>
     <message>
         <source>READY!</source>
-        <translation type="unfinished"></translation>
+        <translation>KLAR!</translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
-        <translation type="unfinished"></translation>
+        <translation>1. SPILLER</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
-        <translation type="unfinished"></translation>
+        <translation>2. SPILLER</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
+        <translation>TILLYKKE</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
+        <translation>DU HAR OPNÅET</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
+        <translation>EN PLADS I TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">@DD@/@MM@ &apos;@YY@</translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/launchersettings.ts b/i18n/da/launchersettings.ts
index d6ee0ff..0060372 100644
--- a/i18n/da/launchersettings.ts
+++ b/i18n/da/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Launcher indstillinger</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libfreetypefactory.ts b/i18n/da/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/da/libfreetypefactory.ts
+++ b/i18n/da/lib.ts
diff --git a/i18n/da/libbatteryapplet-ipaq.ts b/i18n/da/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 7d66225..0000000
--- a/i18n/da/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index 3bd3f47..e895936 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -1,85 +1,85 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Close</source>
         <translation>Luk</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Oplader</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Procent batteri tilbage</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Batteri status: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>God</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Kritisk</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>På backup strøm</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Strøm on-line</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Ekstern strøm afbrudt</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Batteri tid tilbage</translation>
     </message>
     <message>
         <source>Battery status</source>
-        <translation type="unfinished"></translation>
+        <translation>Batteristatus</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Fejl</translation>
     </message>
     <message>
         <source>could not open file</source>
-        <translation type="unfinished"></translation>
+        <translation>kunne ikke åbne fil</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Procent strøm tilbage:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Tid tilbage på batteriet:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libclockapplet.ts b/i18n/da/libclockapplet.ts
index 4eb9e18..780a104 100644
--- a/i18n/da/libclockapplet.ts
+++ b/i18n/da/libclockapplet.ts
@@ -1,2 +1,11 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;System-klokken ser ikke ud til at passe.
+(%1)&lt;/p&gt;&lt;p&gt;Vil du stille den nu?&lt;/p&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libflat.ts b/i18n/da/libflat.ts
index 8406d92..f5229c6 100644
--- a/i18n/da/libflat.ts
+++ b/i18n/da/libflat.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Flad</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libflatstyle.ts b/i18n/da/libflatstyle.ts
index 4eb9e18..ea4245d 100644
--- a/i18n/da/libflatstyle.ts
+++ b/i18n/da/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Flad</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libinterfaces.ts b/i18n/da/libinterfaces.ts
index 407ea1f..e543638 100644
--- a/i18n/da/libinterfaces.ts
+++ b/i18n/da/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP-adresse</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Undernet maske</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC-adresse</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
+        <translation>G&amp;enstart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP-adresse</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Undernet maske</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC-adresse</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
+        <translation>&amp;Vis avanceret information</translation>
+    </message>
+    <message>
+        <source>be &amp;silent</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface opsætning</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
+        <translation>Start automatisk</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Statisk IP opsætning</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnet maske</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Første DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP-adresse</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Anden DNS</translation>
+    </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libirdaapplet.ts b/i18n/da/libirdaapplet.ts
index 291e2b3..7181936 100644
--- a/i18n/da/libirdaapplet.ts
+++ b/i18n/da/libirdaapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Found:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fandt:</translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mistet:</translation>
     </message>
     <message>
         <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fundet enhed:</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Deaktiver IrDA</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiver IrDA</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable Discovery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Deaktiver modtagelse</translation>
     </message>
     <message>
         <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiver modtagelse</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libkppp.ts b/i18n/da/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/da/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libliquid.ts b/i18n/da/libliquid.ts
index 693ea99..471b37e 100644
--- a/i18n/da/libliquid.ts
+++ b/i18n/da/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Liquid Stil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Ingen gennemsigtighed</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Stiplet, baggrundsfarve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Stiplet, knap farve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Gennemsigtigt stiplet, baggrundsfarve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Gennemsigtigt stiplet, knap farve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Brugerdefineret gennemsigtighed</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Menu farve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Tekst farve</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Uigennemsigtighed</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Vis menu tekst med skygge</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Flade knapper på værktøjslinien</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Stiplet kontrast</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Høj ydelses Liquid stil af Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libmpeg3plugin.ts b/i18n/da/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/da/libmpeg3plugin.ts
+++ b/i18n/da/libmodplugin.ts
diff --git a/i18n/da/libopie.ts b/i18n/da/libopie.ts
index da530df..a4c78e1 100644
--- a/i18n/da/libopie.ts
+++ b/i18n/da/libopie.ts
@@ -1,108 +1,663 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Kalender-knap</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Kontakter-knap</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Menu-knap</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Post-knap</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Home-knap</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Optag-knap</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Roter skærmbillede</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rød:</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Grøn:</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Blå:</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Vælg farve</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Mere</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Mere...</translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Navn:</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Størelse</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Stor</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Mellem</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Lille</translation>
+    </message>
+</context>
+<context>
+    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Uge</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Måned</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>År</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Hver:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Hyppighed</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Afslut den:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Ingen slut dato</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Gentagelse aktiv</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation></translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Ingen slut-dato</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>dage</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>dag</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>uger</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>uge</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>måneder</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>månede</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>år</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>år</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>og</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+og</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, og</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Ingen gentagelse</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>dag(e)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Gentagelse aktiv</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Man</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Tir</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Ons</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Fre</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Lør</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Søn</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>uge(r)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Gentag efter</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Dag</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>månede(r)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>år</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Hver</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>på</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Vælg tid:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description:</source>
+        <translation type="obsolete">Beskrivelse:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Prioritet:</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Deadline:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Kategori:</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>Standard email:</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Kontor:</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Arbejde hjemmeside:</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Arbejde tlf:</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Arbejde fax:</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Arbejde mobil-tlf:</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Forretning pager:</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Privat hjemmeside:</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Privat telefon:</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Privat fax:</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Privat mobil-tlf:</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>Alle email-adresser:</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Stilling:</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Assistent:</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Leder:</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Mand</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Kvinde</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Køn:</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Ægtefælle:</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Fødselsdag:</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Bryllupsdag:</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Børn:</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Notater:</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Start:</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Slut:</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Notat:</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Hver</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 hver </translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>Den %1 hver</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Hver</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Mandag</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Tirsdag</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Onsdag</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Torsdag</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Fredag</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Lørdag</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Søndag</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Dokumenter</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Filer</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Alle filer</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Meget høj</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Høj</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Lav</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Meget lav</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Placering:</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Hele dagen</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Flere dage</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbejds-adresse:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Hjemme-adresse:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>Den %1 %2 på hver</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>.</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>.</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>.</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>.</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libopieobex.ts b/i18n/da/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/da/libopieobex.ts
+++ b/i18n/da/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libpolished.ts b/i18n/da/libpolished.ts
index 611bcc2..e12aa0f 100644
--- a/i18n/da/libpolished.ts
+++ b/i18n/da/libpolished.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Polished</source>
-        <translation type="unfinished"></translation>
+        <translation>Poleret</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 03e0914..635fe39 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -1,899 +1,958 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(flere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personlig</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Flere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Ny Kategori</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Ny Kategori</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategori Redigering</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorier</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Program</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorier placeres her</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Vælg kategorierne som dette dokument tilhører.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Indtast en ny kategori her. Tryk &lt;b&gt;Tilføj&lt;/b&gt; for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Indtast en ny kategori til venstre og tryk for at tilføje den til listen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Tryk for at slette den valgte kategori.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Tjek afkrydsningsfeltet for at gøre denne egenskab tilgængelig for alle programmer.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desværre! Et andet
 program er igang med at
 redigere kategorierne.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Redigér Kategorier</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Vis januar i det valgte år</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vis foregående måned</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Vis næste måned</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Vis december i det valgte år</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Luk Filvælgeren</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Vis dokumenter af denne type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Vis dokumenter i denne kategori</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik for at vælge et dokument fra listen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, eller vælg &lt;b&gt;Nyt Dokument&lt;/b&gt; for at lave et nyt dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klik og hold for at se dokumentets egenskaber.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Strengen blev ikke fundet.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Slutningen er nået. Starter fra begyndelsen</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Find hvad:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start søgning ved:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Søg baglæns</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Egenskaber</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fejl under sletning af filen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopi af</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliker</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fejl under kopiering af filen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fejl under flytning af filen.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Brug brugerdefineret rotation</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Indlæs programmet på forhånd så det er klar til brug.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Navnet på dette dokument.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Mediet som dokumentet ligger på.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokation:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hurtig indlæsning (bruger hukommelse)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Slet dette dokument.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Lav en kopi af dette dokument.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Send dette dokument til en anden enhed.</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Ejer information</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation></translation>
     </message>
     <message>
         <source>2</source>
         <translation></translation>
     </message>
     <message>
         <source>3</source>
         <translation></translation>
     </message>
     <message>
         <source>4</source>
         <translation></translation>
     </message>
     <message>
         <source>5</source>
         <translation></translation>
     </message>
     <message>
         <source>6</source>
         <translation></translation>
     </message>
     <message>
         <source>7</source>
         <translation></translation>
     </message>
     <message>
         <source>8</source>
         <translation></translation>
     </message>
     <message>
         <source>9</source>
         <translation></translation>
     </message>
     <message>
         <source>0</source>
         <translation></translation>
     </message>
     <message>
         <source>OK</source>
         <translation></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nej</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nyt Dokument</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Der opstod at problem under
 oprettelsen af konfigurations
 informationen til dette program.
 
 Frigør noget lagerplads og
 prøv igen.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Kunne ikke oprette opstarts
 filer. Frigør noget lagerplads
 før du indtaster data</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kunne ikke sætte alarmen.
 Frigør noget hukommelse og prøv igen.</translation>
     </message>
     <message>
         <source>D</source>
         <translation></translation>
     </message>
     <message>
         <source>M</source>
         <translation></translation>
     </message>
     <message>
         <source>Y</source>
         <translation></translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>måned</translation>
     </message>
     <message>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source>PM</source>
         <translation></translation>
     </message>
     <message>
         <source>AM</source>
         <translation></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Er du sikker på du vil slette
+        <translation type="obsolete">Er du sikker på du vil slette
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Arbejds adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Hjemme adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Email adresser: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Hjemme telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Hjemme fax:  </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Hjemme mobil: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Hjemme webside: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejds webside: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejds telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejds fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejds mobil: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Arbejds personsøger: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Erhverv: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Chef: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mand</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kvinde</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Køn: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ægtefælle: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Fødselsdag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Årsdag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Øgenavn: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Navne titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffiks</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Gem som</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Job titel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Arbejds telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Arbejds fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Arbejds mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Hjemme telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Hjemme fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Hjemme mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Arbejds gade</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Arbejds by</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Arbejds stat</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Arbejds postnr.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Arbejds land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Arbejds personsøger</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Arbejds webside</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Erhverv</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Chef</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Hjemme gade</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Hjemme by</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Hjemme stat</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Hjemme postnr.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Hjemme land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Hjemme webside</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Ægtefælle</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Køn</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Fødselsdag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Årsdag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Øgenavn</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Børn</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Noter</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupper</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tir</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Ons</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation>%1 dokument</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Klik for at lukke dette vindue uden at gemme ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Klik for at lukke dette vindue.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Klik for at gøre dette vindue flytbart.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Klik for at få dette vindue til at bruge hele skærmen.</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Der findes ikke nogen omfattende hjælp til dette program, men der er stadig kontekstfølsom hjælp.&lt;p&gt;Sådan bruger du kontekstfølsom hjælp:&lt;p&gt;&lt;ol&gt;&lt;li&gt;klik og hold hjælpeknappen&lt;li&gt;når vindues titlen viser &lt;b&gt;Hvad er det...&lt;/b&gt;, så klik på det du vil have hjælp med.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Hvad er det...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation>Klik for at lukke dette vindue og kassere ændringer.</translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Vil du slette(new line)
+%1?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation>Klik for at lukke dette vindue.</translation>
+        <source>Jan</source>
+        <translation>Jan</translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation>Klik for at lukke dette vindue og anvende ændringer.</translation>
+        <source>Feb</source>
+        <translation>Feb</translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation>Klik for at gøre dette vindue flytbart.</translation>
+        <source>Mar</source>
+        <translation>Mar</translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation>Klik for at få dette vindue til at bruge hele skærmen.</translation>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Maj</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Okt</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dec</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kort</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kort</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kort</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern Hukommelse</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Internt Lager</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>&apos;citytime&apos; programmet blev ikke fundet</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>For at vælge tidszoner,
 skal du installere &apos;citytime&apos;.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Ikke mere lagerplads</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kunne ikke planlægge alarmen.
 Frigør noget lagerplads og prøv igen</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 filer</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle filer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/librotateapplet.ts b/i18n/da/librotateapplet.ts
index e9a8374..ac44411 100644
--- a/i18n/da/librotateapplet.ts
+++ b/i18n/da/librotateapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>RotateApplet</name>
     <message>
         <source>Rotate shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotation genvej</translation>
     </message>
     <message>
         <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Roter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libtodayaddressbookplugin.ts b/i18n/da/libtodayaddressbookplugin.ts
index 2f40ece..6cf760a 100644
--- a/i18n/da/libtodayaddressbookplugin.ts
+++ b/i18n/da/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontakter plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fødselsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen fødselsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bryllupsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen bryllupsdage de næsten &lt;b&gt; %1 &lt;/b&gt; dage!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libtodaydatebookplugin.ts b/i18n/da/libtodaydatebookplugin.ts
index e392d58..5dcc78e 100644
--- a/i18n/da/libtodaydatebookplugin.ts
+++ b/i18n/da/libtodaydatebookplugin.ts
@@ -1,83 +1,87 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
+        <translation>[med alarm]</translation>
     </message>
     <message>
         <source>note</source>
-        <translation type="unfinished"></translation>
+        <translation>notat</translation>
+    </message>
+    <message>
+        <source>All day</source>
+        <translation>Hele dagen</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
+    <name>DatebookPluginConfigBase</name>
     <message>
-        <source>Show location</source>
+        <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Show location</source>
+        <translation>Vis sted</translation>
+    </message>
+    <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg dette, hvis stedet for hver aftale skal vises</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis notater</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg dette. hvis notater for hver aftale skal vises</translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
+        <source>Show only later appointments</source>
+        <translation>Vis kun aftaler i fremtiden</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg dette, hvis kun aftaler &quot;senere end nu&quot; skal vises</translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
+        <source>Show time in extra line</source>
+        <translation>Hvis tidspunkt i en linje for sig selv</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
+        <translation>Hvor mange aftaler skal der højest vises? (I kronologisk rækkefølge.)</translation>
     </message>
     <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
+        <source>How many appointment should be shown?</source>
+        <translation>Hvor mange aftaler skal der vises?</translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
+        <source>only today</source>
+        <translation>kun idag</translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
+        <source>How many more days</source>
+        <translation>Hvor mange ekstra dage</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalender plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikke flere aftaler idag</translation>
     </message>
     <message>
         <source>No appointments today</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen aftaler idag</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libtodaytodolistplugin.ts b/i18n/da/libtodaytodolistplugin.ts
index ad67b89..4fb4759 100644
--- a/i18n/da/libtodaytodolistplugin.ts
+++ b/i18n/da/libtodaytodolistplugin.ts
@@ -1,40 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Opgaveliste plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Der er &lt;b&gt; 1&lt;/b&gt; aktiv opgave:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Der er &lt;b&gt; %1&lt;/b&gt; aktive opgaver: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ingen aktive opgaver</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Indstil maksimum antal opgaver der skal vises</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>opgaver vist</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Hvor mange tegns information omkring opgaven skal der vises</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Klip linien efter X tegn</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>opgaver vist </translation>
+        <translation type="obsolete">opgaver vist </translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Indstil maksimum antal opgaver der skal vises</translation>
+        <translation type="obsolete">Indstil maksimum antal opgaver der skal vises</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Klip linien efter X tegn</translation>
+        <translation type="obsolete">Klip linien efter X tegn</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Hvor mange tegns information omkring opgaven skal der vises</translation>
+        <translation type="obsolete">Hvor mange tegns information omkring opgaven skal der vises</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/librestartapplet.ts b/i18n/da/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/da/librestartapplet.ts
+++ b/i18n/da/libtremorplugin.ts
diff --git a/i18n/da/libwlan.ts b/i18n/da/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/da/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libwlanplugin.ts b/i18n/da/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/da/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/mailit.ts b/i18n/da/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/da/mailit.ts
+++ b/i18n/da/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/mediummount.ts b/i18n/da/mediummount.ts
index 6b0b99b..c090829 100644
--- a/i18n/da/mediummount.ts
+++ b/i18n/da/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
-        <translation>Global</translation>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished">Medie montering indstillinger</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
-        <translation>Medie montering indstillinger</translation>
+        <source>Global</source>
+        <translation type="unfinished">Global</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished">Hvis et medie bliver indsat i denne enhed vil Opie prøve at søge efter dokumenter på mediet. Dette kan tage en del tid på større medier. Du kan vælge om Opie skal skanne efter dokumenter globalt eller på et &quot;pr. medie&quot;-basis. Du kan også ændre tidligere indstillinger for hvert medie.</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
-        <translation>Aktiver medie tjek</translation>
+        <translation type="unfinished">Aktiver medie tjek</translation>
     </message>
     <message>
         <source>Use global settings</source>
-        <translation>Brug globale indstillinger</translation>
+        <translation type="unfinished">Brug globale indstillinger</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Hvilke medie filer</translation>
+        <translation type="unfinished">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Lyd</translation>
+        <translation type="unfinished">Lyd</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Alle</translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Billede</translation>
+        <translation type="unfinished">Billede</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Hvis et medie bliver indsat i denne enhed vil Opie prøve at søge efter dokumenter på mediet. Dette kan tage en del tid på større medier. Du kan vælge om Opie skal skanne efter dokumenter globalt eller på et &quot;pr. medie&quot;-basis. Du kan også ændre tidligere indstillinger for hvert medie.</translation>
+        <translation type="unfinished">Video</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished">Opsætning af dette medie. Ændringerne træder i kræft når programmet bliver lukket. For at opdatere Dokument-fanen skal du fjerne og isætte mediet igen.</translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation>Hvilke medie filer</translation>
+        <translation type="unfinished">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Lyd</translation>
+        <translation type="unfinished">Lyd</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Alle</translation>
+        <translation type="unfinished">Alle</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Billede</translation>
+        <translation type="unfinished">Billede</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="unfinished">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation>Begræns søgningen til:</translation>
+        <translation type="unfinished">Begræns søgningen til:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Tilføj</translation>
+        <translation type="unfinished">Tilføj</translation>
     </message>
     <message>
         <source>Always check this medium</source>
-        <translation>Tjek altid dette medie</translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>Opsætning af dette medie. Ændringerne træder i kræft når programmet bliver lukket. For at opdatere Dokument-fanen skal du fjerne og isætte mediet igen.</translation>
+        <translation type="unfinished">Tjek altid dette medie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/mindbreaker.ts b/i18n/da/mindbreaker.ts
index 598d561..7577e5f 100644
--- a/i18n/da/mindbreaker.ts
+++ b/i18n/da/mindbreaker.ts
@@ -1,44 +1,44 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nyt spil</translation>
     </message>
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
         <source>Go%1p%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CurrentGo%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Answer%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Nulstil statistik</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du nulstille statistikken?</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuller</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/networksettings.ts b/i18n/da/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/da/networksettings.ts
+++ b/i18n/da/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/odict.ts b/i18n/da/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/da/odict.ts
+++ b/i18n/da/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/oipkg.ts b/i18n/da/oipkg.ts
deleted file mode 100644
index 1f93af3..0000000
--- a/i18n/da/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/opie-console.ts b/i18n/da/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/da/opie-console.ts
+++ b/i18n/da/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opie-login.ts b/i18n/da/opie-login.ts
index 42551e6..01d0b25 100644
--- a/i18n/da/opie-login.ts
+++ b/i18n/da/opie-login.ts
@@ -1,83 +1,84 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tryk præcist og bestemt på krydsene
+for at kalibrere skærmen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;Velkommen til OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation>Bruger</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodeord</translation>
     </message>
     <message>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation>Stands</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation>Genstart</translation>
     </message>
     <message>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Afslut</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Wrong password</source>
-        <translation type="unfinished"></translation>
+        <translation>Forkert kodeord</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodeordet er forkert.</translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="unfinished"></translation>
+        <source>Failure</source>
+        <translation>Fejl</translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
+        <source>Could not start Opie.</source>
+        <translation>Kunne ikke starte Opie.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opie-sheet.ts b/i18n/da/opie-sheet.ts
deleted file mode 100644
index b2e92d2..0000000
--- a/i18n/da/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/opieftp.ts b/i18n/da/opieftp.ts
index 3d03038..6696d04 100644
--- a/i18n/da/opieftp.ts
+++ b/i18n/da/opieftp.ts
@@ -1,253 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Forbindelse</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Tilslut</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Afbryd</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Opret mappe</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Omdøb</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Skift til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Skift til fjern</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Skift til indstillinger</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Om</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Mappe</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Kodeord</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Fjern server</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Fjern sti</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfig</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Indstil venligst server info</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Kunne ikke tilslutte til
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Kunne ikke logge ind
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Kunne ikke sende
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Kunne ikke sende mapper</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Kunne ikke hente 
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Kunne ikke vise mappen
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Kunne ikke skifte mappe
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Kunne ikke &apos;cd up&apos;
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Kunne ikke hente arbejds mappen
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Skift mappe</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Genindlæs</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Er du sikker på du vil slette
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Den skal være tom</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Kunne ikke oprette mappe
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Kunne ikke slette mappe
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Kunne ikke slette filen
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Kunne ikke omdøbe filen
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke omdøbe</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Den mappe eksisterer ikke</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nyt server navn</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Desværre, navnet er allerede brugt</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opieirc.ts b/i18n/da/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/da/opieirc.ts
+++ b/i18n/da/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opieplayer.ts b/i18n/da/opieplayer.ts
index 4cdf8b1..f197939 100644
--- a/i18n/da/opieplayer.ts
+++ b/i18n/da/opieplayer.ts
@@ -1,268 +1,258 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/opieplayer2.ts b/i18n/da/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/da/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/opierec.ts b/i18n/da/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/da/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/osearch.ts b/i18n/da/osearch.ts
new file mode 100644
index 0000000..f694747
--- a/dev/null
+++ b/i18n/da/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>Søg</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Søg</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Søg i alle</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Versalfølsom</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Brug jokertegn</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Detaljer om søgeresultatet</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Indstillinger</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Valg</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Skriv dine søgeord her</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Programmer</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Dokumenter</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Opgaveliste</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Kalender</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Kontakter</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Resultater</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>vis</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>rediger</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>kør</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>åbn i filhåndtering</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>åbn med</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>vis udførte opgaver</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>vis hændelser i fortiden</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>søg i datoer</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Fil:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>søg indhold</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>søger %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/oxygen.ts b/i18n/da/oxygen.ts
index 8be4be0..ddba1ec 100644
--- a/i18n/da/oxygen.ts
+++ b/i18n/da/oxygen.ts
@@ -1,566 +1,562 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
         <translation>Molar Masse</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Kemisk Formel</translation>
     </message>
     <message>
         <source>Calculate</source>
         <translation>Beregn</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Molar Masse (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Grundstoffernes Komposition (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation></translation>
     </message>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Masse:</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Blok</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektronegativitet</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Atomradius</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Ioniseringsenergi</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densitet</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Kogepunkt</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Smeltepunkt</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Masse</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>GPS</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Udregninger</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hydrogen</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Kulstof</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrogen</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminium</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phosphor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Svovl</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Mangan</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Jern</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nikkel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Kobber</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirkonium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybdæn</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Sølv</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Tin</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Jod</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cæsium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodym</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodym</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantal</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhenium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platin</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Guld</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Kviksølv</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Bly</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuth</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astatin</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Thorium</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinium</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uran</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptunium</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonium</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americium</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curium</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkelium</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californium</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevium</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerium</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Periodiske System</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>FEJL: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Kemiske Data</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/patience.ts b/i18n/da/patience.ts
index 7494471..567c4ce 100644
--- a/i18n/da/patience.ts
+++ b/i18n/da/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
-        <translation>Kabale</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
-        <translation>Freecell</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chicane</source>
-        <translation>Chicane</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Harp</source>
-        <translation>Harp</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
-        <translation>Teeclub</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spil</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>S&amp;kifte kort-bagside</translation>
+        <translation type="obsolete">S&amp;kifte kort-bagside</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Grib kort</translation>
+        <translation type="obsolete">&amp;Grib kort</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Indstillinger</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Spil</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Skift kort-bagside</translation>
+        <translation type="obsolete">Skift kort-bagside</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Grib kort</translation>
+        <translation type="obsolete">Grib kort</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Vend ét kort</translation>
+        <translation type="obsolete">Vend ét kort</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
+        <translation type="obsolete">Vend tre kort</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>S&amp;kifte kort-bagside</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Grib kort</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Skifte kort-bagside</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Grib kort</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Vend ét kort</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
         <translation>Vend tre kort</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/qpdf.ts b/i18n/da/qpdf.ts
index 73bf96d..a04bbbe 100644
--- a/i18n/da/qpdf.ts
+++ b/i18n/da/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
-        <translation>QPdf</translation>
+        <translation>PDF Viser</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Tilpas til bredde</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Tilpas til side</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Åben...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Find...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Fuld skærm</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Første side</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Forrige side</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Gå til side...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Næste side</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Sidste side</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Næste</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Gå til side</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Vælg fra 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>&apos;%1&apos; kunne ikke findes.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>File does not exist !</source>
+        <translation type="obsolete">Filen eksisterer ikke!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
         <translation>Filen eksisterer ikke!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index 46c0593..4ca1b76 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Batteriet er næsten tomt.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>visitkort</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Batteri Status</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Finder dokumenter</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Søger dokumenter</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokument visning</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Lyd</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Link programmer</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Begræns søgning til mappe: (ikke ibrug endnu)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Batteristatus</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Luk ned</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synkroniserings-forbindelse</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Afvis</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Tillad</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Synkroniserer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kontakter&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Fortryd</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/reader.ts b/i18n/da/reader.ts
index 3842246..c3b2da8 100644
--- a/i18n/da/reader.ts
+++ b/i18n/da/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
+    <message>
+        <source>Toolbar Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fil</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Visning</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Markeringer</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Åbn fil</translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bogmærke</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Fuld skærm</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Zoom ind</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Zoom ud</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Tilbage</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Frem</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Hjem</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation>Side op</translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation>Side ned</translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation>Linje op</translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation>Linje ned</translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation>Start</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Slut</translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation>Pil venstre</translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation>Pil højre</translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation>Pil ned</translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation>Pil op</translation>
+    </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
+    <message>
+        <source>Tidy-up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Slet</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Two/One
+Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
     <message>
-        <source>Autoscroll</source>
+        <source>Annotation</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
     <message>
-        <source>Mark</source>
+        <source>International</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fullscreen</source>
+        <source>Ideograms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Ideogram Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Apply font
+to dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Two/One
+Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
+        <source>Strip CR</source>
+        <translation>Fjern CR</translation>
+    </message>
+    <message>
+        <source>Dehyphen</source>
+        <translation>Fjern bindestreger</translation>
+    </message>
+    <message>
+        <source>Single Space</source>
+        <translation>Enkelt mellemrum</translation>
+    </message>
+    <message>
+        <source>Unindent</source>
+        <translation>Fjern indrykninger</translation>
+    </message>
+    <message>
+        <source>Reparagraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Double Space</source>
+        <translation>Dobbelt mellemrum</translation>
+    </message>
+    <message>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Justify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Goto</source>
+        <translation type="unfinished">Gå til</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Slet</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished">Autogenerer</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Slet</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished">Gem</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
         <source>Annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Depluck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Dejpluck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Continuous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Select Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Plucker</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
     <message>
-        <source>Auto</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Page Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Layout</source>
+        <source>Page Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Strip CR</source>
+        <source>Goto Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dehyphen</source>
+        <source>Goto End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Single Space</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unindent</source>
+        <source>Page/Line Scroll</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CPrefs</name>
     <message>
-        <source>Re-paragraph</source>
+        <source>OpieReader Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Double Space</source>
+        <source>Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Layout(2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Locale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remap</source>
+        <source>Buttons</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CURLDialog</name>
     <message>
-        <source>Embolden</source>
+        <source>Save URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zoom In</source>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">Fuld skærm</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Zoom ind</translation>
+    </message>
     <message>
         <source>Zoom Out</source>
+        <translation>Zoom ud</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation type="unfinished">Indstil skrifttype</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Set width</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">Fuld skærm</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ascii</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Page/Line Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Two/One Touch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Font</source>
+        <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">Zoom ind</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">Zoom ud</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation>Indstil skrifttype</translation>
+    </message>
+    <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå til</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Autogenerer</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
+        <translation>Fil</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Markeringer</translation>
+    </message>
+    <message>
+        <source>Find Next</source>
+        <translation>Find næste</translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation>Luk søgning</translation>
+    </message>
+    <message>
+        <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
+        <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Marks</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find Next</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close Find</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do Reg</source>
+        <source>Save Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close Edit</source>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>Skjulte</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/rotation.ts b/i18n/da/rotation.ts
deleted file mode 100644
index a245bea..0000000
--- a/i18n/da/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Rotations indstillinger</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Vælg drejning med indstillingerne til venstre.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>Genstart automatisk Opie?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;Rotation er ikke muligt i denne demo, men det er en understøttet feature i Qt/Embedded.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index 338a8d3..8976158 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -1,106 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Vælg kode</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koden er forkert</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Den indtastede kode er forkert.
 Adgang nægtet</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Indtast ny kode</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Gentag ny kode</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sikkerheds Indstillinger</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Slet kode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Spørg efter kode ved opstart</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Kodeord</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/showimg.ts b/i18n/da/showimg.ts
index 1efa3f2..f3fac97 100644
--- a/i18n/da/showimg.ts
+++ b/i18n/da/showimg.ts
@@ -1,158 +1,158 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Lysstyrke</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Billedviser</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Åbn</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation>Miniature visning</translation>
+        <translation>Miniaturevisning</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Lysbilledshow</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Indstillinger..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Billed Info ...</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Vandret spejling</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Lodret spejling</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Åbn ...</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotér 90</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotér 180</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Rotér 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Lysstyrke ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Sort/Hvid</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Skalér til skærm</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Fuldskærm</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Stop lysbilledshow</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Billedviser</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 farver</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Ægte farver</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha niveau</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha kanal</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Lysbilledshow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Pause mellem billeder</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Gentag lysbilledshow</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Vis billeder baglæns</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Hent billeder roteret 90 grader</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Hent billeder hurtigt</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/snake.ts b/i18n/da/snake.ts
index 574e24d..b0ba044 100644
--- a/i18n/da/snake.ts
+++ b/i18n/da/snake.ts
@@ -1,43 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Snake</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nyt spil</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>SNAKE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Brug piletasterne for at guide
 slangen til at æde musen. Du må ikke
 støde ind i vægge, kanter eller dens hale.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Tryk en tast for at starte</translation>
+        <translation type="obsolete">Tryk en tast for at starte</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>     Point :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
  Dine point: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Tryk en tast for at begynde et nyt spil.</translation>
+        <translation type="obsolete">Tryk en tast for at begynde et nyt spil.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/stockticker.ts b/i18n/da/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/da/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/sysinfo.ts b/i18n/da/sysinfo.ts
index 33b9f01..6aa99d4 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -1,314 +1,298 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished">CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Compact Flash hukommelses kort.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished">Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished">Denne graf repræsenterer hvor meget lager der iøjeblikket er i brug på denne harddisk.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished">SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Secure Digital hukommelses kort.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished">SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished">In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished">RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Program CPU forbrug (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU forbrug (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Denne side viser hvor meget af denne enheds processor er i brug.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Denne side viser hvor meget hukommelse (f.eks. RAM) der bliver allokeret på din håndholdte enhed.
 Hukommelse er kategoriseret som følgende:
 
 1. Brugt - hukommelse brugt af Opie og alle igangværende programmer.
 2. Buffer - midlertidigt lager brugt til at øge ydelsen.
 3. Cache - information der fornyelig har været brugt men ikke er blevet frigjort endnu.
 4. Fri - hukommelsen der iøjeblikket ikke er i brug af Opie eller andre igangværende programmer.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffere (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Hukommelse ialt: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Brug#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Brugt af</translation>
+        <translation type="obsolete">Brugt af</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dette er en liste af alle de kernel moduler der iøjeblikket er indlæst på denne håndholdte enhed.
 
 Klik og hold på et modul for at se yderligere information om modulet eller for at fjerne det.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Vælg en kommando her og klik på Send knappen til højre for at sende kommandoen til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik her for at sende den valgte kommando til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dette område viser detaljeret information om dette modul.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>Vil du virkelig køre
+        <translation type="obsolete">Vil du virkelig køre
 </translation>
     </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dette er en liste over alle processer på denne håndholdte enhed.
 
 Klik og hold på en proces for at se yderligere information om processen eller for at sende et signal til den.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Vælg et signal her og klik på Send-knappen til højre for at sende til denne proces.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik her for at sende det valgte signal til denne proces.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dette område viser detaljeret information omkring denne proces.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>Vil du sende
+        <translation type="obsolete">Vil du sende
 </translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>CF kort: </translation>
-    </message>
     <message>
-        <source>Hard Disk </source>
-        <translation>Harddisk </translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>SD kort </translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>Harddisk /dev/hd </translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>SCSI harddisk /dev/sd </translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>Int. lager </translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Compact Flash hukommelses kort.</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>Denne graf repræsenterer hvor meget lager der iøjeblikket er i brug på denne harddisk.</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug på dette Secure Digital hukommelses kort.</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>In</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>RAM disk</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>System Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Hukommelse</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Lager</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kerne&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompileret af: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Bygget den: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;Model: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;Producent: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Denne side viser de nuværende versioner af Opie, Linux kernen og distributionen der kører på denne håndholdte enhed.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/systemtime.ts b/i18n/da/systemtime.ts
index 521e025..85862a6 100644
--- a/i18n/da/systemtime.ts
+++ b/i18n/da/systemtime.ts
@@ -1,521 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished">Tidsformat</translation>
+        <translation>Tidsformat</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished">hh:mm</translation>
+        <translation>tt:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M hh:mm</translation>
+        <translation>D/M tt:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished">M/D hh:mm</translation>
+        <translation>M/D tt:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished">12/24 timer</translation>
+        <translation>12/24 timer</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished">24 timer</translation>
+        <translation>24 timer</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished">12 timer</translation>
+        <translation>12 timer</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished">Datoformat</translation>
+        <translation>Datoformat</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished">Ugen starter med</translation>
+        <translation>Ugen starter med</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished">Søndag</translation>
+        <translation>Søndag</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished">Mandag</translation>
+        <translation>Mandag</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato/Tid</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Tid</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Indstillinger</translation>
+        <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished">Forudsig</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Forudsig</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du fortsætte?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>Kører:
+ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fejl</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Der opstod en fejl, kunne ikke hente klokken over netværket.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished">Fejl under kørslen af ntpdate</translation>
+        <translation>Fejl under kørslen af ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tids-server</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke hente klokken fra
+server:</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"> sekunder</translation>
+        <source>Could not connect to server </source>
+        <translation>Kunne ikke forbinde til serveren </translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished">Kunne ikke forbinde til serveren </translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Du har bedt om %1 minutters mellemrum, men der er kun gået %2 minutter siden sidste gang klokken blev hentet.&lt;br&gt;Fortsæt?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 sekunder</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttidspunkt</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Hovedmenu</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Forudsig</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">Kør NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">Kører:</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">NTP Fejl</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">Fejl under forsøget på at
-hente tiden fra netværket!</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Fejl under kørslen af ntpdate</translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="obsolete">Fejl under forsøget på at hente
-tiden fra serveren </translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete"> sekunder</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">sidste [h]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">offset [s]</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">forskydning [s/t]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete"> s/t</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Hent tiden fra netværk</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Brug forudsagt tid: </translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">Kunne ikke forbinde til serveren </translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Du bad om en pause på %1 minutter, men kun %2 minutter er gået siden sidste opslag. &lt;br&gt; Kør NTP igen?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Netværks Tid</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Hovedmenu</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Hent tiden fra netværket</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Start Tid:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">-</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Tids forskydning:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Ny Tid:</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Forudsig</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Beregnet forskydning:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Forudsagt tid:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Gennemsnitlig forskydning:</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Brug forudsagt tid</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Forudsig tiden</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Indstillinger</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Brug</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">som</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">NTP serveren klokken skal hentes fra på netværket.</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Advancerede indstillinger</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Vent i </translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">minutter indtil</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">NTP prøver at synkronisere uret med netværket.</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">Sæt en pause på</translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">et nyt NTP opslag vil blive brugt til at forudsige klokken.</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manuel</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Indstil tiden</translation>
+        <translation>Hent klokken over netværket</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Beregnet tidsforskydelse</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Estimeret tidsforskydelse</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Beregnet tid</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Forskydelse [s/t]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished">Forudsig tiden</translation>
+        <translation>Beregn tiden</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished">Brug forudsagt tid</translation>
+        <translation>Brug beregnet tid</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"> s/t</translation>
+        <translation> s/t</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"> sekunder</translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">Dato/Tid</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Tidszone</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Tidsformat</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 timer</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 timer</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Ugen starter med</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Søndag</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Mandag</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Datoformat</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Panelprogram format</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Time</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minut</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
+        <translation> sekunder</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tids-server</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutter mellem opdateringer</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutter mellem beregnet korrektion af uret</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis information om tids-server</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis information om beregnet tid</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished">Time</translation>
+        <translation>Time</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">Minut</translation>
+        <translation>Minut</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished">AM</translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished">PM</translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Dato</translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Tidszone</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Hent tid fra netværket</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished">Brug forudsagt tid</translation>
+        <translation>Brug forudsagt tid</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/tetrix.ts b/i18n/da/tetrix.ts
index da57e87..f1a978e 100644
--- a/i18n/da/tetrix.ts
+++ b/i18n/da/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>tom</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Skriv dit navn!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Bedste spillere</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Point</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Niveau</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Næste</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Point</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Niveau</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Fjernet</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/textedit.ts b/i18n/da/textedit.ts
index 388ea9b..68323f2 100644
--- a/i18n/da/textedit.ts
+++ b/i18n/da/textedit.ts
@@ -1,264 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Åbn</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem</translation>
     </message>
     <message>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem som</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Klip</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Sæt ind</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Indsæt dato og tid</translation>
     </message>
     <message>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation>Søg...</translation>
     </message>
     <message>
         <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom ind</translation>
     </message>
     <message>
         <source>Zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom ud</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
+        <translation>Avancerede muligheder</translation>
     </message>
     <message>
         <source>Wrap lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Ombryd linjer</translation>
     </message>
     <message>
         <source>Start with new file</source>
-        <translation type="unfinished"></translation>
+        <translation>Begynd med ny fil</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Spørg ved afslutning</translation>
     </message>
     <message>
         <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
+        <translation>Åbn altid filen der linkes til</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil-rettigheder</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Rediger</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
     </message>
     <message>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Find næste</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Luk søgning</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slet</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Teksteditor</translation>
     </message>
     <message>
         <source>.desktop File</source>
-        <translation type="unfinished"></translation>
+        <translation>.desktop fil</translation>
     </message>
     <message>
         <source>Linked Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Linket dokument</translation>
     </message>
     <message>
         <source>Goto Line...</source>
-        <translation type="unfinished"></translation>
+        <translation>Gå til linje...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem automatisk hvert 5. minut.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Teksteditor kan se, at &lt;br&gt;du har valgt en &lt;b&gt;.desktop&lt;/b&gt; fil.&lt;br&gt;Åbn &lt;b&gt;.desktop&lt;/b&gt; fil eller &lt;b&gt;linket&lt;/b&gt; fil?</translation>
     </message>
     <message>
         <source>Text Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Teksteditor</translation>
     </message>
     <message>
         <source>Write Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem mislykkedes</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikke navngivet</translation>
     </message>
     <message>
         <source>Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Rettigheder</translation>
     </message>
     <message>
         <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Vælg skrifttype</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nej</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Teksteditor (Text Edit) er copyright&lt;br&gt;2000 Trolltech AS, og&lt;br&gt;
+2002 af &lt;b&gt;L. J. Potter&lt;br&gt;llornkcor@handhelds.org&lt;/b&gt;&lt;br&gt;og er tilgængelig under GPL licensen</translation>
     </message>
     <message>
         <source>Textedit</source>
-        <translation type="unfinished"></translation>
+        <translation>Teksteditor</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Der er ændrede data,
+der ikke er gemt.
+Vil du gemme nu?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gem ikke</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anuller</translation>
     </message>
     <message>
         <source>Not enough lines</source>
+        <translation>Der er ikke linjer nok</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Er du sikker på at du vil&lt;br&gt;&lt;b&gt;slette&lt;/b&gt; den nuværende fil
+ fra disken?&lt;br&gt;Det kan &lt;b&gt;ikke fortrydes!&lt;/b&gt;</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Filrettigheder</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Indstil filrettigheder</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Indstil filrettigheder for:</translation>
     </message>
     <message>
         <source>owner</source>
-        <translation type="unfinished"></translation>
+        <translation>ejer</translation>
     </message>
     <message>
         <source>group</source>
-        <translation type="unfinished"></translation>
+        <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
-        <translation type="unfinished"></translation>
+        <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Ejer</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
-        <translation type="unfinished"></translation>
+        <translation>læse</translation>
     </message>
     <message>
         <source>write</source>
-        <translation type="unfinished"></translation>
+        <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
-        <translation type="unfinished"></translation>
+        <translation>eksekverbar</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Advarsel</translation>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation type="unfinished"></translation>
+        <translation>Fejl- ingen bruger</translation>
     </message>
     <message>
         <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
+        <translation>Fejl- ingen gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
+        <translation>Der opstod en fejl, mens rettigheder blev gemt</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/tictac.ts b/i18n/da/tictac.ts
index 4c865d9..2a42304 100644
--- a/i18n/da/tictac.ts
+++ b/i18n/da/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>Kryds og bolle</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computeren starter</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Spilleren starter</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Spil!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Klik &apos;Spil&apos; for at starte</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Dit træk</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Du vandt!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Computeren vandt!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Uafgjort</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/tinykate.ts b/i18n/da/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/da/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index 245c2d7..003d9b8 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -1,119 +1,190 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Ejes af </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Udfyld venligst visitkortet</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik her for at starte det tilknyttede program</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Ingen plugins fundet</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ingen plugins aktiveret</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Ejes af %1&lt;/b&gt;</translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Idag af Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik her for at gå til indstillingerne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Idag indstillinger</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Hent hvilke plugins i hvilken rækkefølge:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Flyt Op</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Flyt Ned</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Aktiv/Rækkefølge</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Start automatisk
+        <translation type="obsolete">Start automatisk
 ved opvågning?
 (Kun Opie)</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
+        <translation type="obsolete">Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>Minutter inaktiv</translation>
+        <translation type="obsolete">Minutter inaktiv</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
+        <translation type="obsolete">Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Ikon størrelse</translation>
+        <translation type="obsolete">Ikon størrelse</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Indstil størrelsen på ikonet i pixels</translation>
+        <translation type="obsolete">Indstil størrelsen på ikonet i pixels</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Genopfrisk</translation>
+        <translation type="obsolete">Genopfrisk</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Hvor ofte Idag skal genopfriske sig selv</translation>
+        <translation type="obsolete">Hvor ofte Idag skal genopfriske sig selv</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation> sek</translation>
+        <translation type="obsolete"> sek</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>aldrig</translation>
+        <translation type="obsolete">aldrig</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Afkryds feltet for at aktivere/deaktivere et plugin eller brug piletasterne til højre for at ændre rækkefølgen de bliver vist</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Idag konfiguration</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Mini-banner</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>autostart ved opvågning?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>minibanner</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Minibanner</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>Minutter inaktiv</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>pixels</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Indstil størrelsen på ikonet i pixels</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>Ikonstørrelse</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation> sek</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>aldrig</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Hvor ofte Idag skal genopfriske sig selv</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>genopfrisk</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/todaydatebookpluginconfig.ts b/i18n/da/todaydatebookpluginconfig.ts
deleted file mode 100644
index 49779f0..0000000
--- a/i18n/da/todaydatebookpluginconfig.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation>[med alarm]</translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation>note</translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation>Vis lokation</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Vælg dette hvis en begivenheds lokation skal vises for hver enkelt</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation>Vis noter</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Vælg dette hvis noten der er vedhæftet til begivenheden skal vises for hver enkelt</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation>Vis kun kommende
- begivenheder</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Vælg dette hvis det kune er kommende begivenheder der skal vises</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation>Hvor mange 
-begivenheder
-skal der 
-vises?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Hvor mange begivenheder skal maksimalt vises. I kronologisk orden</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation>Hvor mange flere dage</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation>Hvor mange flere dage skal der være i intervallet</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation> dag(e)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation>kun idag</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation>Kalender plugin</translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation>Ikke flere begivenheder i dag</translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation>Ingen begivenheder i dag</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index 95d5ee4..e81cb70 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -1,586 +1,620 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation>Alarmer</translation>
+        <source>Ok</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Påmindelser</translation>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Alarms</source>
+        <translation>Alarmer</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Gentagelse</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Opgave-redigering</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Indtast opgave</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Rediger opgave</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation>stille</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>høj</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Opie Opgaveliste</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>Ny fra skabelon</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Ny opgave</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>Klik her for at oprette en ny opgave.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Rediger opgave</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>Klik her for at redigere den valgte opgave.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Vis opgave</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Slet...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>Klik her for at fjerne den valgte opgave.</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Slet alle...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Slet afsluttede</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>Klik her for at sende den valgte opgave til en anden enhed.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Vis afsluttede opgaver</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Vis kun forfaldne opgaver</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Vis opgave deadlines</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Vis genvejspanel</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Valgmuligheder</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>Hurtig Redigering</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Dette er en liste over alle nuværende opgaver.
 
 Listen viser følgende information:
 1. Afsluttet - Et grønt hak indikerer at opgaven er afsluttet. Klik her for at afslutte en opgave.
 2. Prioritet - En grafisk repræsentation af opgavens prioritet. Dobbel-klik her for at ændre.
 3. Beskrivelse - Beskrivelse af opgaven. Klik her for at vælge opgaven.
 4. Deadline - Viser hvornår opgaven skal være afsluttet. Denne kolonne kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis opgave deadlines&apos; fra menuen ovenover.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Alle kategorier</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere plads</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Opgaveliste kunne ikke
 gemme dine ændringer.
 Frigør noget lagerplads
 og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Opgaveliste</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Kan ikke redigere data da en synkronisering er igang</translation>
+        <translation type="obsolete">Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>Alle opgaver?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>Alle afsluttede opgaver?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;%1 nye opgaver er modtaget.&lt;p&gt;Vil du tilføje dem til din opgaveliste?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nye opgaver</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikere</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>A.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Deadline</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Konfigurer skabeloner</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Skabelon redigering</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Tilføj</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Rediger</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Fjern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Navn</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Ny skabelon %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik her for at bestemme prioriteten på den nye opgave.
+
+Dette område kaldes genvejspanelet.
+
+Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Indtast beskrivelsen af den nye opgave her.
+
+Dette område kaldes genvejspanelet.
+
+Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Mere</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik her for at indtaste yderligere information til den nye opgave.
+
+Dette område kaldes genvejspanelet.
+
+Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik her for at tilføje en ny opgave.
+
+Dette område kaldes genvejspanelet.
+
+Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik her for at nulstille informationen i den nye opgave.
+
+Dette område kaldes genvejspanelet.
+
+Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabel visning</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation>Dato</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Indtast en kort beskrivelse af opgaven her.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbejde</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Køb</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organisere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hent</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Opdater</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Opret</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planlægge</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Ring</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Vælg opgavens prioritet her.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Vælg opgavens kategori.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Gentagende opgave</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Klik her hvis opgaven forekommer på et regelmæssigt basis. Hvis valgt, kan hyppigheden vælges på Gentagelse-fanen.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Noter:</translation>
+        <translation type="obsolete">Noter:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Indtast yderligere information angående opgaven her.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Opgaveliste</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Oversigt:</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klik her for at vælge opgavens nuværende status.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Påbegyndt</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Udsat</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Afsluttet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Ikke påbegyndt</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Forløb:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Angiv opgavens forløb her.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Start dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klik her for at vælge datoen denne opgave var påbegyndt.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Forventet dato:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klik her for at vælge datoen denne opgave skal afsluttes på.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Afsluttet:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klik her for at markere denne opgave som afsluttet.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klik her for at vælge datoen denne opgave var afsluttet.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Vedligeholder rolle:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klik her for at vælge vedligeholderens rolle.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Intet</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Ansvarlig</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Afsluttet af</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Tilrettelæggelse</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Vedligeholder:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dette er navnet på den nuværende opgave vedligeholder.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klik her for at vælge opgave vedligeholderen.</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation>Skabelon redigering</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Tilføj</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Rediger</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Fjern</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation>Ny skabelon %1</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation>Mere</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Annuller</translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Klik her for at bestemme prioriteten på den nye opgave.
-
-Dette område kaldes genvejspanelet.
-
-Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Indtast beskrivelsen af den nye opgave her.
-
-Dette område kaldes genvejspanelet.
-
-Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Klik her for at indtaste yderligere information til den nye opgave.
-
-Dette område kaldes genvejspanelet.
-
-Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Klik her for at tilføje en ny opgave.
-
-Dette område kaldes genvejspanelet.
-
-Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Klik her for at nulstille informationen i den nye opgave.
-
-Dette område kaldes genvejspanelet.
-
-Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/da/ubrowser.ts b/i18n/da/ubrowser.ts
new file mode 100644
index 0000000..0aff43f
--- a/dev/null
+++ b/i18n/da/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>Fejl!</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>IP-adressen ikke fundet</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Kunne ikke oprette socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Kunne ikke forbinde til socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/usermanager.ts b/i18n/da/usermanager.ts
index 4fe204d..40e3688 100644
--- a/i18n/da/usermanager.ts
+++ b/i18n/da/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Tilføj gruppe</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Redigér gruppe</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>OPIE Brugerhåndtering</translation>
+        <translation type="obsolete">OPIE Brugerhåndtering</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Opie Brugerhåndtering</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Tilføj bruger</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Redigér bruger</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/wellenreiter.ts b/i18n/da/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/da/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/de/.directory b/i18n/de/.directory
index b3a98b2..3596fd5 100644
--- a/i18n/de/.directory
+++ b/i18n/de/.directory
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Name=German
 Name[da]=Tysk
 Name[de]=Deutsch
 Name[es]=Alemán
 Name[hu]=Német
 Name[it]=Tedesco
 Name[ja]=ドイツ語
 Name[no]=Tysk
 Name[pt]=Alemão
 Name[pt_BR]=Alemão
 Name[sl]=Nemščina
+Name[nl]=Duits
\ No newline at end of file
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 69f2389..1c6bba9 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -1,1214 +1,1213 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Kompletter Name</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Auswählen</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Adressen</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>E-Mail schreiben an</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Eintrag versenden</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard importieren</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Persönliche Daten</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Während der Synchronisation ist das Bearbeiten nicht möglich</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Persönliche Daten ändern</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Adresse ändern</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Adressbuch - Meine persönlichen Daten</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nicht genügend Speicher</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Sicherung fehlgeschlagen
 Bitte sorgen Sie für mehr
 Speicherplatz und versuchen
 sie es erneut.
 
 Dennoch beenden?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nicht zugewiesen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Suche schließen</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Daten speichern</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nicht gefunden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Karten</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Karte</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Suche starten</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Korrekter Dateityp ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>Suchmuster konnte nicht gefunden werden !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Die ausgewählte Datei endet
 nicht mit &quot;.vcf&quot;. 
 Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kontakt hinzufügen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wollen Sie den Kontakt %1 wirklich
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Ja, alle</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>vCard exportieren</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Sie müssen einen Eintrag auswählen !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Sie müssen einen Dateinamen angeben !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Benutze reguläre Ausdrücke</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Benutze Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Beachte Großschreibung</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Bevorzuge QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Bevorzuge Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation>Beachte: QT-Mail is nur im Sharp 
+        <translation>Beachte: QT-Mail ist nur im Sharp 
 Default-Rom enthalten. Opie-Mail
 ist frei erhältlich !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Sucheinstellungen</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Reihenfolge</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Wähle Reihenfolge für Kontakt: </translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klicken sie auf den Reiter um diesen auszuwählen</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Einstellungen für den Typ der Suchstil</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Die Suchfunktion erwartet einen regulären Ausdruck, wenn dies ausgewählt wurde</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
-        <translation>Die Suchfunktion erwartet ein simples Such-Muster</translation>
+        <translation>Die Suchfunktion erwartet ein simples Suchmuster</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Wenn dies ausgewählt wurde unterscheidet die Suche Groß- und Kleinschreibung</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Schriftgröße für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
-        <translation>Schriteinstellung für Liste und Kartenansicht</translation>
+        <translation>Schrifteinstellungen für Liste und Kartenansicht</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Sofern verfügbar wird Sharps Mailanwendung verwendet</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>OPIEs Mailanwendung wird verwendet</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Ausgewähltes Element eine Zeile nach oben verschieben</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Ausgewähltes Element eine Zeile nach unten verschieben</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste aller verfügbaren Elemente</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Hinzufügen des gewählten Elements von der unteren zur oberen Liste</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
-        <translation>Entfrnen des gewählten Elements aus der oberen Liste</translation>
+        <translation>Entfernen des gewählten Elements aus der oberen Liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Reihenfolge (von oben nach unten) definiert den primären Kontakt der in der rechten Spalte angezeigt wird</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation>Werkzeug-/Menuleiste</translation>
+        <translation>Werkzeug-/Menüleiste</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixiert</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schalter für fixierte Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Beweglich</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schalter für bewegliche Werkzeugleiste - 
 wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Voller Name...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notizen...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privat</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Staat</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postleitzahl</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Vereinigte Staaten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
-        <translation>Grossbritannien</translation>
+        <translation>Großbritannien</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanien</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerien</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikanisch Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinien</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australien</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Österreich</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Aserbaidschan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesch</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgien</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda-Inseln</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasilien</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarien</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodscha</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Kap Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Cayman Inseln</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Tschad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Weihnachtsinseln</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kolumbien</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Komoren</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Inseln</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Elfenbeinküste</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatien</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Zypern</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tschechei</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dänemark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanische Republik</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Ost-Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Ägypten</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Äquatorial Guinea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Äthiopien</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Inseln</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Färöer Inseln</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finnland</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankreich</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Franz. Guiana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Franz. Polynesien</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgien</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Deutschland</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griechenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grönland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Vatikanstadt</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungarn</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Island</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indien</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesien</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italien</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanien</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kasachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenja</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettland</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litauen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Mazedonien</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediven</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauretanien</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Mikronesien</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldawien</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolei</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibien</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Niederlanden</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Neukaledonien</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Neuseeland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norwegen</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Neu Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Philippinen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ile La Réunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Rumänien</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabien</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slovakei</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenien</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon-Inseln</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Südafrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanien</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Sankt Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swasiland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Schweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Schweiz</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tadschikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tansania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesien</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Türkei</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ukraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Usbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Jungfraueninseln</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westsahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Jugoslavien</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Sambia</translation>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index 3518e34..3c1d458 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -1,317 +1,368 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Erweiterter Dateimanager</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Versteckte Dateien anzeigen</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Verzeichnis erstellen</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Befehl ausführen</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Befehl ausführen mit Ausgabe</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Lokalansicht</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Fernansicht</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Konnte nicht umbenannt werden</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Verzeichnis existiert nicht</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Kopieren als</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Dateimanager Ausgabe</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Dateimanager Senden</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir versandt.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Verzeichnis wechseln</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Als Text öffnen</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Symlink erstellen</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Verschieben</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Dateiinfo</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation>Einstellungen</translation>
+        <translation>Eigenschaften</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Datei Beamen</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Als</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>In selbes Verzeichnis kopieren</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Konnte nicht kopieren
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>nach
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Nicht verschiebbar
 </translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Zu den Dokumenten hinzufügen</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Alle auswählen</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Wirklich %1 Dateien löschen?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Verzeichnis löschen?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Wirklich löschen
-
-</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Wirklich %1 Dateien kopieren?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Datei existiert bereits!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>existiert bereits.
 Soll wirklich gelöscht werden?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 existiert. Überschreiben?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>%1 konnte nicht zu %2 kopiert werden</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Dateimanager
 Copyright 2002-2003 von
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 unter der GPL</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation>Das aktuelle Verzeichnis ist nicht in 
-den Lesezeichen und kann deshalb
-nicht entfernt werden.
-</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Lesezeichen-Verzeichnis</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Aktuelles Verzeichnis aus den Lesezeichen entfernen</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Kann das aktuelle Verzeichnis
+von den Lesezeichen nicht entfernen,
+da es nicht in den Lesezeichen ist!</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Dateisuche</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>%1 und alle Inhalte wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>%1 wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">AdvancedFm :: </translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete">kB frei</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Ausgabe in Datei speichern (nur Name)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Prozess konnte nicht gestartet werden</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Fertig</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Berechtigungen setzen für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andere</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>Lesen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>Schreiben</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Ausführen</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Fehler - kein Benutzer</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Fehler - keine Gruppe</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Fehler beim Setzen der Grupper oder des Besitzers</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Fehler beim Setzen des Modus</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 27207b2..64ba9f7 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -1,278 +1,280 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Einstellungen...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Aktuelles Schema</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Anpassen...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Stil für alle Anwendungen erzwingen.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>Stil für diese Anwendungen deaktivieren&lt;br&gt;(&lt;b&gt;*&lt;/b&gt; kann als Platzhalter benutzt werden):</translation>
+        <translation>Stil für diese Anwendungen deaktivieren (&lt;b&gt;*&lt;/b&gt; kann als Platzhalter benutzt werden):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation>Programmdatei(en)</translation>
+        <translation>Binäre Datei(en)</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Reiterstil:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Reiter mit Icons</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Aufklappliste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Aufklappliste mit Symbolen</translation>
+        <translation>Aufklappliste m. Symb. </translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Oben</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Unten</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenster</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Soll %1 neu gestartet werden?</translation>
+        <translation>Wollen Sie %1 nun neu starten?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Schema speichern</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Schema speichern</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schema exitiert bereits.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Schema löschen</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation>Das aktuelle Schema kann nicht gelöscht werden.</translation>
+        <translation>Kann das aktuelle Schema nicht löschen.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;neu&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
-        <translation>Stile kontrollieren das Erscheinungsbild von Elementen wie Schaltflächen und Rollbalken.
-Klicken Sie hier, um einen verfügbaren Stil auszuwählen.</translation>
+        <translation>Stile kontrollieren die Art und Weise, wie Elemente, wie bspw. Buttons und Scrollbars,  in Anwendungen erscheinen.
+Klicken Sie hier, um einen verfübgbaren Stil auszuwählen.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
-        <translation>Klicken Sie hier um den momentan ausgewählten Stil anzupassen.
-Diese Option ist nicht für alle Stile verfügbar.</translation>
+        <translation>Klicken Sie hier um den momentan verfügbaren Stil auszuwählen.
+&lt;b&gt;Hinweis&lt;/b&gt;: Diese Option ist nicht für alle Stile verfügbar.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
-        <translation>Fensterdekorationen kontrollieren das Erscheinungsbild der Titelzeile und der Knöpfe darin.
+        <translation>Windowdekorationen kontrollieren die Art der Titelleiste und der entsprechenden Buttons
 Klicken Sie hier um eine verfügbare Dekoration auszuwählen.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Wählen Sie hier Namen, Stil und Größe des Standardfonts, den alle Anwendungen verwenden.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
-        <translation>Farbschemata kontrollieren die Farben der einzelnen Bildelemente.
+        <translation>Farbschemata sind ein eSammlung von Farben, welche für verschiedene Teile der Anzeige verwendet werden.
 Klicken Sie hier, um ein verfügbares Farbschema auszuwählen.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
-        <translation>Klicken Sie hier, um die Farben des ausgewählten Schemas zu ändern.</translation>
+        <translation>Klicken Sie hier, um die Farbe der aktuellen Farbe oder des aktuellen Schemas auszuwählen.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation>Klicken Sie hier, um das ausgewählte Farbschema zu löschen.</translation>
+        <translation>Klicken Sie hier, um um das in der linken Liste ausgewählte Farbschema zu löschen.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klicken Sie hier, um das aktuelle Farbschema zu speichern.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation>Klicken Sie hier um die Verwendung eines einheitlichen Erscheinungsbildes durch alle Anwendungen zu erzwingen.</translation>
+        <translation>Klicken Sie hier, damit alle Anwendungen die globalen Erscheinungseinstellungen verwenden.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation>Sollten einige Anwendungen mit dem einheitlichen Erscheinungsbild nicht korrekt angezeigt werden, können hier einzelne Eigenschaften für diese Anwendung ausgeschaltet werden.</translation>
+        <translation>Sollten einige Anwendungen mit dem globalen Erscheinungsbild nicht korrekt angezeigt werden, können hier bestimmte Eigenschaften für diese Anwendung ausgeschaltet werden.
+Dieser Bereich erlaubt anwendungsspezifische Eigenschaften auszuschalten.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation>Klicken Sie hier, um der Liste eine Anwendung hinzuzufügen.</translation>
+        <translation>Klicken Sie hier, um eine Anwendung in obige Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation>Klicken sie hier, um die gewählte Anwendung aus der Liste zu löschen.</translation>
+        <translation>Klicken sie hier, um die gewählte Anwendung zu löschen.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation>Klicken sie hier, um die gewählte Anwendung in der Liste nach oben zu verschieben.</translation>
+        <translation>Klicken sie hier, um die gwählte Anwendung in der Liste n ach oben zu verschieben.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>Klicken sie hier, um die gewählte Anwendung in der Liste nach unten zu verschieben.</translation>
+        <translation>Klicken sie hier, um um die gewählte Anwendung in der Liste nach unten zu verschieben.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation>Klicken sie hier, um den gewünschten Stil für reiterbasierte Dialoge (wie diese Anwendung) auszuwählen. Die verfügbaren Stile sind
-1. Reiter - normale Reiter mit Texttiteln
-2. Reiter mit Symbolen - Reiter mit Symbolen, der Text erscheint nur im ausgewählten Reiter.
+        <translation>Klicken sie Hier, um de gewünschten Stil für reiterbasierte Dialoge (wie diese Anwendung) auszuwählen. Die verfügbaren Stile sind
+1. Reiter- normale Reiter mit Texttiteln
+2. Reiter m. Symb. - Reiter mit Symbolen, bei denen der Text nur im ausgewählten Reiter erscheint
 3. Aufklappliste - Eine vertkale Auswahlliste zum Aufklappen mit Text
-4. Aufklappliste mit Symbolen - Eine vertikale Auswahlliste zum Aufklappen mit Symbolen</translation>
+4. Aufklappliste m. Symbolen - Eine vertikale Auswahlliste zum Aufklappen mit Symbolen
+</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
-        <translation>Klicken Sie hier, um alle Reiter im oberen Fensterteil zu positionieren.</translation>
+        <translation>Klicken Sie hier, um alle Reiter im oberen Teil zu positionieren.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation>Klicken Sie hier, um alle Reiter im unteren Fensterteil zu positionieren.</translation>
+        <translation>Klicken Sie hier, um alle Reiter im unteren Teil zu positionieren.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dies ist das Vorschaufenster. Hier können Sie sehen, wie das neue Erscheinungsbild durch Ihre Änderungen beeinflusst wird.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Erscheinungsbild-Einstellungen</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotationsrichtung: </translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
-        <translation>Schema bearbeiten</translation>
+        <translation>Schema editieren</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klicken Sie hier zum Aussuchen einer Farbe für:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Beispiel</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normales Element</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Deaktiviertes Element</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normaler Text</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Markierter Text</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knopf</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Checkbox</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Beispielfenster mit den gewählten Einstellungen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/appskey.ts b/i18n/de/appskey.ts
deleted file mode 100644
index 1f5301b..0000000
--- a/i18n/de/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Anwendungstasten festlegen</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Addressbuch</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Home</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Popup Menu</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>EMail</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Terminplaner</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index 2e30141..04a8337 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -1,591 +1,696 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategorienfilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Wählen Sie eine oder mehrere Gruppen</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
-        <translation>Lese Konfiguration...</translation>
+        <translation>Lese Konfiguration ...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Entfernen
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installieren
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Aktualisieren
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Neuinstallation)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Aktualisierung)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Verfügbarer Speicher</translation>
+        <translation>Verf. Speicher</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation>Starten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Benutzerabbruch ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Vorgang abgebrochen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Ausgabe speichern</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 kB</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Installiere abhängige Pakete</translation>
+        <translation>--force.depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Erlaube Neuinstallation</translation>
+        <translation>--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Entferne abhängige Pakete</translation>
+        <translation>--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Erlaube Überschreiben bestehender Dateien</translation>
+        <translation>--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informationslevel</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Nur Fehler</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale Meldungen</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informative Meldungen</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Ausgaben zur Fehlersuche</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation> Bearbeite Paket %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Löschen symbolischer Links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Erstellung symbolischer Links für %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Erstellung symbolischer Links für %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Erledigt</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Entfernen des Statuseintrags...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>Statusdatei -</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>Paket-</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Statusdatei konnte nicht geöffnet werden- </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Temp. Statusdatei konnte nicht geöffnet werden- </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>ipkg konnte nicoht gestartet werden</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>Öffnen fehlgeschlagen: </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Erstellung Verzeichnis </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Verlinkung von %1 mit %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Verlinkung von %1 mit %2 fehlgeschlage</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>%1 gelöscht</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Löschen %1 fehlgeschlagen</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Gelöscht </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Löschen fehlgeschlagen </translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation>AQPkg - der Paketmanager</translation>
+        <translation>AQPkg- der Paketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tippen Sie den Suchtext hier ein.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klicken Sie hier um die alphabetische Schnellleiste auszublenden.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Listen aktualisieren</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Klicken Sie hier um die Paketlisten vom Server zu aktualisieren.</translation>
+        <translation>Klicken Sie hier für eine aktualisierte Fassung der Serverliste.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation>Paket(e) aktualisieren</translation>
+        <translation>Aktualisieren</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Klicken Sie hier, um alle installierten Pakete zu aktualisieren, sofern eine neuere Version vorhanden ist.</translation>
+        <translation>Klicken Sie hier, um alle installierten Pakete zu aktualisieren, siofern eine neuere Version vorhanden ist.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation>Herunterladen</translation>
+        <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Klicken Sie hier um die ausgewählten Pakete herunterzuladen.</translation>
+        <translation>Klicken Sie hier um das ausgewählte Paket downzuloaden.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Übernehmen</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Klicken Sie hier, um die ausgewählten Pakete zu installieren, zu löschen oder zu aktualisieren.</translation>
+        <translation>Klicken Sie hier, um das ausgewählte Paket zu löschen oder zu aktualisieren.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktion</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation>Nicht installierte Pakete anzeigen</translation>
+        <translation>Nicht installierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Klicken Sie hier, um Pakete anzuzeigen, die nicht installiert sind.</translation>
+        <translation>Klicken Sie hier um Pakete anzuzeigen, die nicht installiert wurden.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Installierte Pakete anzeigen</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klicken Sie hier um installierte Pakete anzuzeigen.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation>Aktualisierbare Pakete anzeigen</translation>
+        <translation>Aktualisierte Pakete anz.</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klicke Sie hier um nur installierte Pakete anzuzeigen, für die eine neuere Version verfügbar ist.</translation>
     </message>
     <message>
         <source>Filter by category</source>
-        <translation>Kategoriefilter</translation>
+        <translation>Filtern n. Kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation>Klicken Sie hier, um Pakete aufzulisten, die einer bestimmten Kategorie zugehören.</translation>
+        <translation>Klicken Sie hier um Pakete aufzulisten, die einer bestmmten Kategorie zugehören.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Filterkategorie setzen</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation>Klicken Sie hier, um die Paketkategorie in den verwendeten Filter zu übernehmen.</translation>
+        <translation>Klicken Sie hier um die Paketkategorie in den verwendeten Filter zu übernehmen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Klicken Sie hier, um nach Paketnamen zu suchen.</translation>
+        <translation>Klicken Sie hier um Text in Paketnamen zu suchen.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation>Nächstes suchen</translation>
+        <translation>Nächstes finden</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klicken Sie hier um das nächste Paket mit Ihrem Suchtext zu finden.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Alphabetische Schnellleiste</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation>Klicken Sie hier, um die alphabetische Schnellliste ein- und auszublenden.</translation>
+        <translation>Klicken Sie hier um die alphabetische Schnellliste ein- und auszublenden.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Anzeigen</translation>
+        <translation>Anzg.</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation>Einstellungen</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Klicken Sie hier um die Suchleiste auszublenden.</translation>
+        <translation>Klicken Sie hier um die Finden-Leiste auszublenden.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server: </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klicken Sie hier, um einen Feedserver auszuwählen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakete</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dies ist eine Liste aller Pakete des oben gewählten Feed-Servers.
-Eine blaue Kugel neben dem Paketnamen zeigt an, dass das Paket installiert ist.
-Ein blauer Punkt mit einem gelben Stern zeigt, dass eine neuere Version des Pakets auf dem Server verfügbar ist.
-Um ein Paket auszuwählen klicken Sie in das Rechteck auf der linken Seite.</translation>
+Eine blaue Kugel neben dem Paketnamen zeigt an dass das Paket zur Zeit installiert ist.
+Ein blauer Punkt mit einem gelben Stern zeit dass eine neuere Version des Pakets auf dem Server verfügbar ist.
+Um ein Paket auszuwählen klicken Sie in das Rechtecke auf der linken Seite.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation>Klicken Sie hier um die ausgewählten Pakete zu entfernen.</translation>
+        <translation>Klicken Sie hier um asgewählte Pakete zu entfernen</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Serverlistenerstellung: 
 <byte value="x9"/>%1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Paketlistenerstellung für:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Installiert auf - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Beschreibung - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Größe - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Sektion - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Dateiname - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">V. Installiert - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">V. Verfügbar - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
-        <translation>Aktualisiere die Paketliste</translation>
+        <translation>Aktualisierung der Paketliste</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
-        <translation>WARNUNG
+        <translation>WARNUNG !!!
 Ein Upgrade während
 OPIE/Qtopia läuft ist
 nicht zu empfehlen.
 
-Sind Sie sicher?</translation>
+Sind Sie sicher ?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation>Installierte Pakete aktualisieren</translation>
+        <translation>Installierte Pakete upgraden</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
-        <translation>Soll %1 entfernt werden?</translation>
+        <translation>Sind Sie sicher %1 
+löschen zu wollen ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation>Sind Sie sicher?</translation>
+        <translation>Sind Sie sicher ?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation>Herunterladen nach</translation>
+        <translation>Wohin downloaden </translation>
     </message>
     <message>
         <source>Enter path to download to</source>
-        <translation>Geben Sie den Zielpfad zum Herunterladen ein.</translation>
+        <translation>Geben Sie den Downloadpfad ein</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation>Paket vom Server installieren</translation>
+        <translation>Entferntes Paket installieren</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Geben Sie die Paketquelle ein</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nichts zu tun</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Keine Pakete ausgewählt</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Möchten Sie %1
-löschen oder neu installieren?</translation>
+löschen oder neu installieren ?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Löschen oder Neuinstallation</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Neuinstallation</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Möchten Sie %1
-löschen oder aktualisieren?</translation>
+löschen oder aktualisieren ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Löschen oder Aktualisieren</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Aktualisiere Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation>&lt;b&gt;Beschreibung&lt;/b&gt;: </translation>
+        <translation>&lt;b&gt;Bechreibung&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Installiert nach&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Installiert&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Größe&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Größe&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Kategorie&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Dateiname&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Dateiname&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Installierte Version&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Installiete Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Verfügbare Version&lt;/b&gt;: </translation>
+        <translation>&lt;p&gt;&lt;b&gt;Verfügbare Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation>Paketinformationen</translation>
+        <translation>Paketinformation</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation>Paketinformationen sind nicht verfügbar</translation>
+        <translation>Paketinformation nicht verfügbar</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Installierte pakete</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Lokale Pakete</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>Nicht verfügbar</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Paket- %1
+Version- %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+installierte Version- %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>Versionsnummer ist leer.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Epochennumer ist keine Zahl.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Kein Wert nach Doppelpunkt in der Versionsnummer.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Löschen</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation>Einstellungen</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Ziele</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation>Proxies</translation>
+        <translation>Proxys</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name: </translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Aktiver Server</translation>
+        <translation>Aktive Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Aktualisieren</translation>
+        <translation>Aktualisierung</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Mit Root verlinken</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Aktiviert</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Benutzername:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/backgammon.ts b/i18n/de/backgammon.ts
index 4eb9e18..65f467d 100644
--- a/i18n/de/backgammon.ts
+++ b/i18n/de/backgammon.ts
@@ -1,2 +1,168 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Retten&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Auslöschen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Schützen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Sichern&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Leeren&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Standardwerte</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Hilfe</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Steine aus der Endzone entfernen</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Einen generischen Stein entfernen</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Einen eigenen Stein schützen, indem einen 
+weiteren in diesen Schacht legt</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Einen Stein in einen Schacht legen der bereits 
+von einem anderen Spieler belegt ist</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Stein in einen leeren Schacht setzen</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>? gedrückt halten um Hilfe zu erhalten</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Neu</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Laden</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Spiel</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Thema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Spieler</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>KI</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regeln</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Optionen</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>Thema %1 löschen?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Abbruch</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Thema laden</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;kein Zug&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Spieler 1 gewinnt. Auf das Brett klicken für ein neues Spiel&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Spieler 1 gewinnt. Auf das Brett klicken für ein neues Spiel&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Spieler 2 zieht&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Spieler 1 zieht&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index 81f71ac..ab2801f 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Sichern und Wiederherstellen... arbeitet...</translation>
+        <translation>Sichern und Wiederherstellen... arbeitet ...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sichern</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Speichern nach</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Quelle wählen</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Spalte 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/bounce.ts b/i18n/de/bounce.ts
index b40e1e0..afda86c 100644
--- a/i18n/de/bounce.ts
+++ b/i18n/de/bounce.ts
@@ -1,101 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Bounce</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Neues Spiel</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Spiel pausieren</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spiel</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Punktestand: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Leben: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Füllstand: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Zeit: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
-        <translation>Bounce Ebene: %1</translation>
+        <translation>Bonze Ebene: %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Spielstand: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
-        <translation>Spiel pausiert: Drücken Sie &lt;b&gt;P&lt;/b&gt; zum Fortfahren.</translation>
+        <translation>Spiel pausiert: Drücken Sie &lt;b&gt;P&lt;/b&gt; zum Fortfahren !</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
-        <translation>Game Over!
+        <translation>Verloren!
 Spielstand: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Zeit: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Leben: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Füllstand: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Füllstand: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
-        <translation>Erfolgreich aufgeräumt: 75%.</translation>
+        <translation>Erfolgreiche aufgeräumt: 75%.</translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 Punkte: 15 Punkte pro Leben</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 Punkte: Bonus</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
-        <translation>%1 Punkte: Gesamtpunkte</translation>
+        <translation>%1 Punkte: Gesamtstand</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
-        <translation>Auf zu Ebene %1: Sie erhalten dieses Mal %2 Leben.</translation>
+        <translation>Auf zu Ebene %1: sie erhalten %2 Leben diesmal !</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Über</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/buttonsettings.ts b/i18n/de/buttonsettings.ts
index 1b2fcdb..bcb182e 100644
--- a/i18n/de/buttonsettings.ts
+++ b/i18n/de/buttonsettings.ts
@@ -1,113 +1,113 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ButtonSettings</name>
     <message>
         <source>Button Settings</source>
         <translation>Anwendungstasten</translation>
     </message>
     <message>
         <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Drücken oder halten Sie die Taste, die Sie ändern möchten.&lt;/center&gt;</translation>
+        <translation>&lt;center&gt;Drücken Sie oder halten Sie die Taste, die Sie ändern möchten&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Press:</source>
         <translation>Gedrückt: </translation>
     </message>
     <message>
         <source>Hold:</source>
         <translation>Gehalten: </translation>
     </message>
     <message>
         <source>Beam VCard</source>
-        <translation>VCard versenden</translation>
+        <translation>VCard beamen</translation>
     </message>
     <message>
         <source>Send eMail</source>
         <translation>Mail senden</translation>
     </message>
     <message>
         <source>Toggle Menu</source>
         <translation>Menü umschalten</translation>
     </message>
     <message>
         <source>Toggle O-Menu</source>
         <translation>Startmenü umschalten</translation>
     </message>
     <message>
         <source>Show Desktop</source>
         <translation>Arbeitsfläche anzeigen</translation>
     </message>
     <message>
         <source>Toggle Recording</source>
         <translation>Aufnahme umschalten</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
         <translation>&lt;nobr&gt;Ignoriert&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
         <translation>&lt;nobr&gt;Anzeige &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
         <translation>&lt;nobr&gt;Aufruf von &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
         <translation>&lt;nobr&gt;Aufruf von &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
 </context>
 <context>
     <name>RemapDlg</name>
     <message>
         <source>%1 %2</source>
         <comment>(hold|press) buttoname</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>Held</source>
         <translation>Gehalten</translation>
     </message>
     <message>
         <source>Pressed</source>
         <translation>Gedrückt</translation>
     </message>
     <message>
         <source>No mapping</source>
         <translation>Keine Zuweisung</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Nutzerdefiniert</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
 </context>
 <context>
     <name>RemapDlgBase</name>
     <message>
         <source>Action</source>
         <translation>Aktion</translation>
     </message>
     <message>
         <source>Channel</source>
         <translation>Kanal</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/buzzword.ts b/i18n/de/buzzword.ts
index af3c2af..bca5f40 100644
--- a/i18n/de/buzzword.ts
+++ b/i18n/de/buzzword.ts
@@ -1,22 +1,21 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
         <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Neues Spiel</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spiel</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation>&lt;h1&gt;&lt;b&gt;BINGO!&lt;/b&gt;&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/calculator.ts b/i18n/de/calculator.ts
index 34c3d83..2641918 100644
--- a/i18n/de/calculator.ts
+++ b/i18n/de/calculator.ts
@@ -1,137 +1,136 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
-        <translation>Experimenteller Taschenrechner</translation>
+        <translation>Experimentaler Taschenrechner</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
         <translation>(</translation>
     </message>
     <message>
         <source>)</source>
         <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>=</source>
         <translation>=</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
         <translation>Taschenrechner</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/calibrate.ts b/i18n/de/calibrate.ts
new file mode 100644
index 0000000..e11338b
--- a/dev/null
+++ b/i18n/de/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Berühren Sie das Kreuz so präsise wie
+möglich zum Kalibrieren des Bildschirms.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Willkommen in Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/checkbook.ts b/i18n/de/checkbook.ts
index ef3aa36..db06496 100644
--- a/i18n/de/checkbook.ts
+++ b/i18n/de/checkbook.ts
@@ -1,513 +1,516 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
-        <translation>Konto</translation>
+        <translation>Kontobuch</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
-        <translation>Buchungen</translation>
+        <translation>Transaktionen</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Auswertung</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geben Sie hier den Namen des Kontos ein.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Wählen Sie hier den Typ des Kontos.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Sparbuch</translation>
+        <translation>Ersparnisse</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>laufendes Konto</translation>
+        <translation>Rechnung</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>Sparbrief</translation>
+        <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Geldmarktkonto</translation>
+        <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fonds</translation>
+        <translation>Rentenfond</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Andere</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank: </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
-        <translation>Geben Sie den Namen der Bank hier ein.</translation>
+        <translation>Geben Sie den Namen des Kontos hier ein.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Kontonummer: </translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Geben Sie hier die Kontonummer für dieses Konto hier ein.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN: </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Geben Sie hier die PIN für dieses Konto ein.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startguthaben: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Geben Sie hier das Startguthaben dieses Kontos ein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Geben Sie hier zusätzliche Notizen ein.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Aktueller Stand: %10.00</translation>
+        <translation>Momentaner Stand: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Dieser Bereich zeigt den aktuellen Kontostand an.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
-        <translation>Dies ist eine Liste aller Buchungen für dieses Konto.
+        <translation>Dies ist eine Liste aller Transaktionen dieses Kontos.
 Um Einträge nach einem Feld zu sortieren klicken Sie auf den Spaltennamen.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation>Betrag</translation>
+        <translation>Menge</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
-        <translation>Klicken Sie hier um eine neue Buchung anzulegen.</translation>
+        <translation>Klicken Sie hier um eine neue Transaktion anzulegen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
-        <translation>Wählen Sie eine Buchung und klicken Sie hier um sie zu bearbeiten.</translation>
+        <translation>Wählen Sie eine Transaktion und klicken Sie hier um sie zu bearbeiten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
-        <translation>Wählen sie ein Konto und klicken Sie hier um es zu löschen.</translation>
+        <translation>Wählen sie ein Konto und klciken Sie hier um es zu löschen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation>Wählen Sie die gewünschte Grafik und klicken Sie den &lt;b&gt;Zeichnen&lt;/b&gt;-Schalter.</translation>
+        <translation>Wählen Sie den gewünschten Graphen und klicken Sie den &lt;b&gt;Zeichnen&lt;/b&gt;-Schalter.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
-        <translation>Wählen Sie hier die gewünschte Grafik.</translation>
+        <translation>Wählen Sie hier den gewünschten Graphen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
-        <translation>Auszahlungen nach Kategorie</translation>
+        <translation>Ausgaben n. Kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
-        <translation>Einzahlungen nach Kategorie</translation>
+        <translation>Einnahmen n. Kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Zeichnen</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
-        <translation>Klicken Sie hier um die gewünschte Grafik zu erstellen.</translation>
+        <translation>Klicken Sie hier um den gewünschten Graphen zu erstellen.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Momentaner Stand: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
-        <translation>Buchung löschen</translation>
+        <translation>Transaktion löschen</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Passwortschutz</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klicken Sie hier um den Passwortschutz für dieses Konto zu aktivieren oder zu deaktivieren.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Nummer</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Geben Sie ein Passwort ein</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitte geben Sie ein Passwort ein: </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bestätigen Sie das Passwort</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bitte bestätigen Sie das Passwort:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Bitte geben Sie das Passwort ein um die Aufhebung des Passwortschutzes zu bestätigen:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Kontokonfiguration</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geben Sie das Währungssymbol ein:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geben Sie Ihr lokales Währungssymbol hier ein.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Anzeigen der Passwortschutzfunktion</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klicken Sie hier, um den Passwortschutz im Hauptfenster anzuzeigen.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Anzeige der Kontostände</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation>Klicken Sie hier, um die Anzeige der Kontostände im Hauptfenster zu aktivieren.</translation>
+        <translation>Klicken Sie hier, um die Anzeige der Kontostände der einzelnen Konten im Hauptfenster angezeigt werden sollen.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klicken Sie hier, um ein neues Konto anzulegen.
 Sie können auch &lt;b&gt;Neu&lt;/b&gt; aus dem Konto-Menü wählen.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation>Berabeiten</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation>Wählen Sie ein ein Konto und klicken Sie hier, um es zu bearbeiten.
-Sie können auch &lt;b&gt;Bearbeiten&lt;/b&gt; aus dem Kontomenü wählen oder mit dem Stift auf einen Kontobuch dücken und ihn kurz dort halten.</translation>
+        <translation>Wählen Sie ein ein Konto und klicken Sie hier um es zu bearbeiten.
+Sie können auch &lt;b&gt;Bearbeiten&lt;/b&gt; aus dem Konto-menü wählen oder mit dem Stift auf einen Kontobuch dücken und ihn kurz dort halten.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wählen Sie ein Konto und klicken Sie hier um es zu löschen.
-Sie können auch &lt;b&gt;Löschen&lt;/b&gt; aus dem Kontomenü wählen.</translation>
+Sie können auch &lt;b&gt;Löschen&lt;/b&gt; aus dem Konto-menü wählen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dies ist eine Auflistung aller verfügbaren Konten.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Konto löschen</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation>Einstellungen</translation>
+        <translation>Konfigurieren</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
-        <translation>Klicken Sie hier um die Einstellungen für die Anwendung zu ändern.</translation>
+        <translation>Klicken Sie hier um die Anwendung zu konfigurieren.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kontoname</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Kontostand</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Passwort-Eingabe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Bitt geben Sie Ihr Passwort ein:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
-        <translation>Buchung auf </translation>
+        <translation>Transaktion für </translation>
     </message>
     <message>
         <source>Withdrawal</source>
-        <translation>Auszahlung</translation>
+        <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation>Wählen Sie hier, ob es sich um eine Ein- oder Auszahlung handelt.</translation>
+        <translation>Wählen Sie hier ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation>Einzahlung</translation>
+        <translation>Einnahme</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum: </translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
-        <translation>Wählen Sie das Buchungsdatum hier.</translation>
+        <translation>Wählen Sie das Transaktionsdatum hier.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer: </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Geben Sie hier die Nummer ein.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beschreibung: </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
-        <translation>Geben Sie hier den Buchungstext ein.</translation>
+        <translation>Geben Sie hier die Beschreibung der Transaktion ein.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
-        <translation>Wählen Sie die Kategorie der Buchung  hier.</translation>
+        <translation>Wählen Sie die Transaktionskategorie  hier.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation>Wählen Sie den Buchungstyp hier.
-Die verfügbaren Optionen hängen davon ab, ob es sich um eine Ein- oder Auszahlung handelt.</translation>
+        <translation>Wählen Sie den Transaktionstyp hier.
+Die verfügbaren Optionen hängen davon ab, ob es sich um eine Einnahme oder Ausgabe handelt.</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Betrag: </translation>
+        <translation>Menge: </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
-        <translation>Geben Sie den Buchungsbetrag hier an.
-Der eingegebene Betrag sollte immer positiv sein.</translation>
+        <translation>Geben Sie den Wert der Transaktion hier an.
+Der eingegebene sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebühr: </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
-        <translation>Geben Sie eine Gebühr ein, die mit dieser Buchung in Verbindung steht.
-Der Betrag der Gebühr sollte immer positiv sein.</translation>
+        <translation>Geben Sie eine Gebühr ein, die mit dieser Transaktion in Verbindung steht.
+Der Wer der Gebühr sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
-        <translation>Geben Sie hier weitere Informationen ein.</translation>
+        <translation>Geben Sie heir weitere Informationen ein.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Rechnungen</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleidung</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elektronik</translation>
+        <translation type="obsolete">Elektronik</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Unterhaltung</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Essen</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Benzin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Sonstiges</translation>
+        <translation>Versch.</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filme</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Miete</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Reisen</translation>
+        <translation>Reise</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation>Kreditrate</translation>
+        <translation>Abzahlung</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Scheck</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation>Überweisung</translation>
+        <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditkarte</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Arbeit</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familienmitgiled</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Kredit</translation>
+        <translation>Kreditsache</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Bankeinzug</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Bar</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/citytime.ts b/i18n/de/citytime.ts
index ecb5758..017d621 100644
--- a/i18n/de/citytime.ts
+++ b/i18n/de/citytime.ts
@@ -1,68 +1,67 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
-        <translation>Zeitänderung</translation>
+        <translation>Zeitäanderung</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>Es gab ein Problem beim Setzen der Zeitzone: %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Zeitzone zurücksetzen</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation>Es gab ein Problem beim Setzen Ihrer Zeitzone. Ihre Zeit könnte nun falsch sein...</translation>
+        <translation>Es gab eine Problem beim Setzen Ihrer Zeitzone. Ihre Zeit könnte nun falsch sein...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Weltzeituhr</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
         <translation>Klicken Sie auf eine der Städte um sie zu ersetzen</translation>
     </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>STADT</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
-        <translation>Die Zeitzoneninformation konnte nicht gefunden werden</translation>
+        <translation>Kann die Zeitzoneninformation nicht finden</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation>&lt;p&gt;Es konnte keine Zeitzoneninformation in %1 gefunden werden.</translation>
+        <translation>&lt;p&gt;Es konnte keine Zeitzoneninformation in %1 gefunden werden.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
-        <translation>Die Karte konnte nicht gefunden werden</translation>
+        <translation>Die Karte kontne nicht gefunden werden</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation>&lt;p&gt;Die Karte %1 konnte nicht geladen werden. Programmabbruch</translation>
+        <translation>&lt;p&gt;Die Karte %1 konnte nicht geladen werden. Programmabbruch&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Continent</source>
         <translation>Kontinent</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
         <translation>Wählen Sie hier einen Kontinent, dann eine Stadt</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Stadt</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/clock.ts b/i18n/de/clock.ts
index e283a23..0f2c19d 100644
--- a/i18n/de/clock.ts
+++ b/i18n/de/clock.ts
@@ -1,95 +1,98 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Schlummern</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Uhr</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Stoppuhr</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Alarm einstellen</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarm ist An</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarm ist Aus</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation>Datum und Zeit einstellen.</translation>
+        <translation>Datum und Uhrzeit setzten.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Uhr: Ein Alarm wurde verpasst.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarmzeit gesetzt: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
-        <translation>Weckzeit einstellen</translation>
+        <translation>Alarmzeit einstellen</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Stunde</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Schlummerdauer
 (Minuten)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>MP3-Alarm</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/confedit.ts b/i18n/de/confedit.ts
index 17ab571..3251e34 100644
--- a/i18n/de/confedit.ts
+++ b/i18n/de/confedit.ts
@@ -1,79 +1,78 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>EditWidget</name>
     <message>
         <source>File Name:</source>
-        <translation>Dateiname:</translation>
+        <translation>Datei Name:</translation>
     </message>
     <message>
         <source>Group:</source>
         <translation>Gruppe:</translation>
     </message>
     <message>
         <source>Key:</source>
         <translation>Schlüssel:</translation>
     </message>
     <message>
         <source>Value:</source>
         <translation>Wert:</translation>
     </message>
 </context>
 <context>
     <name>ListViewConfDir</name>
     <message>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <source>Could not open</source>
         <translation>Konnte nicht öffnen</translation>
     </message>
     <message>
         <source>The directory </source>
         <translation>Das Verzeichnis</translation>
     </message>
     <message>
         <source> could not be opened.</source>
         <translation>konnte nicht geöffnet werden.</translation>
     </message>
 </context>
 <context>
     <name>ListViewItemConfFile</name>
     <message>
         <source>Could not open</source>
         <translation>Konnte nicht öffnen</translation>
     </message>
     <message>
         <source>The file </source>
         <translation>Die Datei</translation>
     </message>
     <message>
         <source> could not be opened.</source>
         <translation>konnte nicht geöffnet werden.</translation>
     </message>
     <message>
         <source>no group</source>
         <translation>Keine Gruppe</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Conf File Editor</source>
-        <translation>Konfigurationsdateien bearbeiten</translation>
+        <translation>Conf Datei Editor</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation>Speichern</translation>
+        <translation>Speichere</translation>
     </message>
     <message>
         <source>Revert</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation>Lösche</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 22dc590..9da48a0 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -1,812 +1,839 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>7 Tage</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Der Termin dauert unter Umständen
 länger als die Wiederholungsinterval.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kann Daten zur Zeit nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Ereignis editieren</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender war nicht in der Lage,
 Ihre Änderungen zu speichern.
 Bitte machen Sie etwas Speicherplatz
 frei.
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Unbekannt)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Beheben</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Weiter</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Termin duplizieren</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editieren...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>Fehlerbox</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Eintrag ist ganztägig.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Dieses Vorkommen Senden</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voreinstellungen</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Erster anzuzeigender Termin</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Startzeit:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarmeinstellungen</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvorwarnzeit</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Unterschiedliches</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Spaltenstil:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Ansichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Defaultansicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Wochenliste</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Sprung zu &quot;jetzt&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Zeitanzeige</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Beginn-Ende</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Termin ist ganztägig.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>MDMDFSSM</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>P</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mo</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>D</translation>
+        <translation type="obsolete">Di</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mi</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>D</translation>
+        <translation type="obsolete">Do</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>F</translation>
+        <translation type="obsolete">Fr</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sa</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>S</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>P</translation>
+        <translation type="obsolete">So</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Wiederholung...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Täglich...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wöchentlich...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Monatlich...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jählich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>endet um</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Abendessen</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Bescheibung</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notizen...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Notiz bearbeiten</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Mittagessen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Den %1. %2. in jedem </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Am %1. jeden </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Den %1. %1. jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Keine Wiederholung</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Tag(e)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>,
 und</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>am</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Zu wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholen am</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WochenVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>Monate</translation>
     </message>
     <message>
         <source>years</source>
         <translation>Jahre</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/drawpad.ts b/i18n/de/drawpad.ts
index 11224ee..1b5afa0 100644
--- a/i18n/de/drawpad.ts
+++ b/i18n/de/drawpad.ts
@@ -1,441 +1,449 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Alles löschen</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importieren</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importieren...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exportieren</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exportieren...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Werkzeuge</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Neue Seite</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Seite säubern</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Seite löschen</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Rückgängig</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Erste Seite</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Verherige Seite</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Nächste Seite</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Letzte Seite</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Punkt zeichen</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Linie zeichnen</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Rechteck zeichen</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>gefülltes Rechteck zeichen</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Ellipse zeichen</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>gefüllte Ellipse zeichen</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Bereich füllen</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Punkt löschen</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Stiftbreite</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Stiftfarbe</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Füllfarbe</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Text einfügen</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vorschau...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Seiteninformationen</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Seiteninformationen...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Wollen Sie alle Seiten
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Kantenglättung</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Hier klicken um ein neues Blatt zu erzeugen.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Hier klicken, um das aktuelle Blatt zu löschen.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Hier klicken, um  das aktuelle Blatt zu entfernen.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>Hier klicken, um die letzte Aktion zu widerrufen.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>Hier klicken, um die letzte Aktion erneut auszuführen.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>Hier klicken, um  die erste Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>Hier klicken, um die vorherige Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>Hier klicken um die nächste Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>Hier klicken, um die letzte Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>Hier klicken, um eines der verfügbaren Linienwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>Hier klicken, um eines der verfügbaren Rechteckwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>Hier klicken, um eines der verfügbaren Ellipsenwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>Hier klicken, um das Textwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>Hier klicken, um das Füllwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>Hier klicken, um das Löschwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>Hier klicken, um die Dicke des Zeichenstifts zu setzen.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>Hier klicken, um die Zeichenfarbe zu wählen..</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>Hier klicken, um die Füllfarbe zu wählen..</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>Schmierzettel - Seite %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Seitenauswahl</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Aktuelle</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Bereich</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Bis:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>exportieren als</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>Schmierzettel - Exportieren</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Alle Bilder</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>autom. Vorschau</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>Schmierzettel- Importieren</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Alle Bilder</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Neue Seite</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Weiß</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Stiftfarbe</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Füllfarbe</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Weite:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Seiteninformationen</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Allgemeines</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Weite:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Titel: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Dimension: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Datum: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Text eingeben</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Schmierzettel - Vorschau</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Seite säubern</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Wollen Sie die Seite
 wirklich säubern?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Seite löschen</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Hier klicken, um ein neues Blatt zu erzeugen.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Hier klicken, um das aktuelle Blatt zu löschen.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Hier klicken, um das aktuelle Blatt zu entfernen.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>Hier klicken, um das aktuelle Blatt eine Position nach oben zu verschieben.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>Hier klicken, um das aktuelle Blatt eine Position nach unten zu verschieben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/embeddedkonsole.ts b/i18n/de/embeddedkonsole.ts
index 90f9a90..6e3194b 100644
--- a/i18n/de/embeddedkonsole.ts
+++ b/i18n/de/embeddedkonsole.ts
@@ -1,218 +1,239 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">Neu</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="obsolete">Bearbeiten</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">Löschen</translation>
+    </message>
+    <message>
+        <source>up</source>
+        <translation type="obsolete">Hoch</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation type="obsolete">Runter</translation>
+    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Befehle</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Befehle&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Vorgeschlagene Befehle&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>winzig</translation>
     </message>
     <message>
         <source>Small Fixed</source>
-        <translation>klein, fixiert</translation>
+        <translation>klein, feste Breite</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
-        <translation>mittel, fixiert</translation>
+        <translation>mittel, feste Breite</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Leertaste</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Befehlsliste anzeigen</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Befehlsliste verbergen</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tabs unten</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Grün auf Schwarz</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Schwarz auf Weiß</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Weiß auf Schwarz</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Schwarz auf Transparent</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Schwarz auf Rot</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rot auf Schwarz</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Grün auf Gelb</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blau auf Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta auf Blau</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan auf Weiß</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Weiß auf Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blau auf Schwaru</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bernstein auf Schwarz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Schnelles Editieren</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Laufleiste</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Befehlsleiste anzeigen</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Befehlsliste verstecken</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Benutzerdefiniert</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Befehlsliste</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Töne benutzen</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation>Tabs unten</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Befehl hinzufügen</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Geben Sie den Befehl ein,
 den Sie hinzufügen wollen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/euroconv.ts b/i18n/de/euroconv.ts
index 4eb9e18..ae84dc6 100644
--- a/i18n/de/euroconv.ts
+++ b/i18n/de/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished">Euroconv</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/filebrowser.ts b/i18n/de/filebrowser.ts
deleted file mode 100644
index ec54eaa..0000000
--- a/i18n/de/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Dateimanager</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Verz</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Sortieren</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>nach Name</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>nach Größe</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>nach Datum</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>nach Typ</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Absteigend</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Versteckt</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Symlinks</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ansicht</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Vorh. Verz.</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Überg. Verz.</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Neues Verzeichnis</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Ausschneiden</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Piktogramme</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Dateimanager</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>/dev/ kann nicht angezeigt werden</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Datei umbenennen</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Umbenennung fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Datei einfügen</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Einfügen fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Datei ausschneiden</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Ausschneiden fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Sind Sie sicher?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nein</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Löschen fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Neues Verzeichnis</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Fehler beim Verzeichnis anlegen !</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Amwendung starten ?</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Start fehlgeschlagen !</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Zu Dokumenten hinzufügen</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Ausführen</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Als Text anzeigen</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Umbennen</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Ausschneiden</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Einfügen</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Rechte ändern</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Alle auswählen</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Alle abwählen</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Rechte ändern</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Dateirechte setzen</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Setze Dateirechte für:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>Besitzer</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>Gruppe</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>andere</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Besitzer</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Gruppe</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>lesen</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>schreiben</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>ausführen</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/formatter.ts b/i18n/de/formatter.ts
index 62224d2..20dfae3 100644
--- a/i18n/de/formatter.ts
+++ b/i18n/de/formatter.ts
@@ -1,169 +1,215 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formatierer</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Medientyp</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Dateisysteme</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatieren</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Haupt</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>WARNUNG
+        <translation type="obsolete">WARNUNG
 Das Ändern von Parametern
 hier kann zu Funktionsstörungen
 des Systems führen.</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>fstab bearbeiten</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Disk prüfen</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mountpoint</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Formatieren ?!?</translation>
+        <translation type="obsolete">Formatieren ?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Wirklich formatieren
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>mit</translation>
+        <translation type="obsolete">mit</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>Dateisystem ?!? Sie verlieren alle Daten !!</translation>
+        <translation type="obsolete">Dateisystem ?!? Sie verlieren alle Daten !!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Formatieren nicht möglich:
 Unbekannter Typ.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Formatierungsausgabe</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Versuche unzumounten</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>Unmounten fehlgeschlagen !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Unmounten fehlgeschlagen !
 Gerät ist in Benutzung.</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Formatierungsversuch.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Kein solches Gerät vorhanden!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 wurde erfolgreich formatiert.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Versuche zu mounten.</translation>
+        <translation type="obsolete">Versuche zu mounten.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Kartenmount fehlgeschlagen!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 wurde erfolgreich gemountet.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
-        <translation>Sie können das Ausgabefenster nun schliessen.</translation>
+        <translation>Sie können das Ausgabefenster nun schließen.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Intern</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Medientyp:</translation>
+        <translation type="obsolete">Medientyp:</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Gesamt: %1 KB ( %d MB)</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Benutzt: %1 KB ( %d MB)</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Verfügbar: %1 KB ( %d MB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>ACHTUNG:
+Das Ändern von Parametern auf 
+dieser Seite kann die Funktionalität
+des Systems beeinträchtigen!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>Formatieren?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>mit Dateisystem %1?
+Alle Daten gehen verloren!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>%1 wird ausgebunden.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>%1 wird eingebunden.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1 wurde erfolgreich eingebunden.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Speichertyp: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Typ: %1
+Formatiert mit %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/helpbrowser.ts b/i18n/de/helpbrowser.ts
index 4d1f401..bc0e126 100644
--- a/i18n/de/helpbrowser.ts
+++ b/i18n/de/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vorwärts</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Home</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Neues Bookmark</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Aus Bookmarks löschen</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Hilfeanzeiger</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>Hilfeanzeiger</translation>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kbill.ts b/i18n/de/kbill.ts
index 5ec02e4..86ba84f 100644
--- a/i18n/de/kbill.ts
+++ b/i18n/de/kbill.ts
@@ -1,64 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Spiel anhalten</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Geschichte v. kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regeln</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Spiel anhalten</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation>&lt;b&gt;Die Geschichte&lt;/b&gt;&lt;p&gt;Wieder einmal liegt das Schicksal der Welt in Ihren Händen! Ein bösartiger Computerhacker, den man lediglich unter seinem Alias &quot;Bill&quot; kennt, hat den ultimativen Computervirus kreiert. Einen derart mächtigen Virus, dass dieser in der Lage ist, jedes Computersystem in einen ganz ordinären Toaster zu verwandeln (Ooooh!). &quot;Bill&quot; selbst selbst hat sich mittlerweile in Milliarden-Millionen kleinster Microbills geklont. Ihre Absicht ist es den hinterhältigen Virus zu verbreiten, getarnt als bekanntes und verbreitetes Betriebssystem. Als Systemadninistrator und Unkrautvernichter ist es Ihre Aufgabe, Bill das Handwerk zu legen und ihn von seinem schändlichen Treiben abzuhalten.</translation>
+        <translation>&lt;b&gt;Die Geschichte&lt;/b&gt;&lt;p&gt;Wieder einmal liegt das Schicksal der Welt in Ihren Händen! Ein bösartiger Computerhacker, den man lediglich unter seinem Alias &quot;Bill&quot; kennt, hat den ultimativen Computervirus kreiert. Einen derart mächtigen Virus, dass dieser in der Lage ist, jedes Computersystem in einen ganz ordinären Toaster zu verwandeln (Ooooh!). &quot;Bill&quot; selbst hat sich mittlerweile in Milliarden-Millionen kleinster Microbills geklont. Ihre Absicht ist es den hinterhältigen Virus zu verbreiten, getarnt als bekanntes und verbreitetes Betriebssystem. Als Systemadministrator und Unkrautvernichter ist es Ihre Aufgabe, Bill das Handwerk zu legen und ihn von seinem schändlichen Treiben abzuhalten.</translation>
     </message>
     <message>
         <source>The story of KBill</source>
         <translation>Geschichte v. kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Regeln v. kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation>&lt;b&gt;Die Regeln&lt;/b&gt;&lt;p&gt;kBill wurde sorgfältig darauf entwickelt einfach bedienbar für die ganze Familie zu sein, so dass auch Oma Eusebia damit zurecht kommt. Jahre, nee, Tage des Betatestens and der Beratung mit den am billigsten zu habenden GUI-Designern ergaben ein Spiel, das einfach zu bedienen ist, wenn auch nicht so einfach wie ein Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schlagen Sie die Bills (klick)&lt;/LI&gt;&lt;LI&gt;Starten Sie die Comuter neu (klick) &lt;/LI&gt;&lt;LI&gt;Heben Sie die gestohlenen Betriebssysteme auf und bringen Sie sie zurück (durch Ziehen) zu den zugehörigen Computern.&lt;/LI&gt;&lt;LI&gt;Ziehen Sie den Eimer um Blitze zu löschen&lt;/LI&gt;&lt;LI&gt;Punkte sammeln basiert auf der gesamten Spielzeit und Boni für das vernichten von Bills&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Den Rest bekommen Sie sicher selbst heraus. Wir haben das auch geschafft, also kann es nicht so schwer sein</translation>
+        <translation>&lt;b&gt;Die Regeln&lt;/b&gt;&lt;p&gt;kBill wurde sorgfältig darauf entwickelt einfach bedienbar für die ganze Familie zu sein, so dass auch Oma Eusebia damit zurecht kommt. Jahre, nee, Tage des Betatestens and der Beratung mit den am billigsten zu habenden GUI-Designern ergaben ein Spiel, das einfach zu bedienen ist, wenn auch nicht so einfach wie ein Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schlagen Sie die Bills (klick)&lt;/LI&gt;&lt;LI&gt;Starten Sie die Computer neu (klick) &lt;/LI&gt;&lt;LI&gt;Heben Sie die gestohlenen Betriebssysteme auf und bringen Sie sie zurück (durch Ziehen) zu den zugehörigen Computern.&lt;/LI&gt;&lt;LI&gt;Ziehen Sie den Eimer um Blitze zu löschen&lt;/LI&gt;&lt;LI&gt;Punkte sammeln basiert auf der gesamten Spielzeit und Boni für das vernichten von Bills&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Den Rest bekommen Sie sicher selbst heraus. Wir haben das auch geschafft, also kann es nicht so schwer sein</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Nach Level </translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Ihr Punktestand </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/keypebble.ts b/i18n/de/keypebble.ts
index 4547f7d..62bf9fd 100644
--- a/i18n/de/keypebble.ts
+++ b/i18n/de/keypebble.ts
@@ -1,291 +1,291 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
-        <translation>Verbunde</translation>
+        <translation>Verbunden</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Verbindung verweigert</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Rechner nicht gefunden</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Lesefehler: Vermutlich hat die Gegenstelle die 
 Verbindung beendet.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>Ein ungültiger Fehlercode wurde zurückgegeben</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Warten auf den Server ...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Warten auf den Desktopnamen...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Verbunden mit %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Protokollfehler: Die Nachricht %1 wurde erhalten- erwartet wurde eine update-Nachricht.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Protokollfehler: Es wurde eine unbekannte Kodierung von Server %1 verwendet</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Warten auf die Server-Version...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
         <translation>Fehler: Ungültige Serverversion %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
         <translation>Fehler: Nicht unterstützte Serverversion %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Angemeldet</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
         <translation>Fehler: Dieser Server erwartet ein Passwort, es wurde aber keines angegeben.
 </translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
         <translation>Fehler: Das angegebene Passwort war nicht korrekt.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
         <translation>Fehler: Zuviele ungültige Anmeldeversuche wurden für diesen Zugang durchgeführt.
 Bitte versuchen Sie es es später noch einmal.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Anmeldung fehlgeschlagen</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zu viele Fehlversuche</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>VNC Anzeiger</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Auflegen</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Vollbild beenden</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Verbunden mit Rechner</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Mit Rechner verbunden</translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation>Verbindung schliessen</translation>
+        <translation>Verbindung schließen</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
         <translation>Bookmark öffnen</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
         <translation>Bookmark löschen</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
         <translation>Ctrl-Alt-Entf. senden</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
         <translation>Nächster Klick ist Doppel-Klick</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
         <translation>Nächster Klick ist Rechts-Klick</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
         <translation>Wählen Sie ein Bookmark dass Sie gerne öffnen möchten</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
         <translation>VNC Verbindung</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Show Password</source>
         <translation>Passwort anzeigen</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Passwort: </translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
         <translation>Bookmarkname:</translation>
     </message>
     <message>
         <source>Host Name:</source>
         <translation>Rechenrname: </translation>
     </message>
     <message>
         <source>Display Number:</source>
         <translation>Displaynummer: </translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
         <translation>Auf Bildschirmaktualisierung testen alle: </translation>
     </message>
     <message>
         <source>Milliseconds</source>
         <translation>Millisekunden</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
         <translation>8bit-Sitzung anfordern</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation>Bei Signal vergrößern</translation>
     </message>
     <message>
         <source>Request shared session</source>
         <translation>Geteilte Sitzung anfordern</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation>Skalierungsfaktor</translation>
     </message>
     <message>
         <source>Encodings</source>
         <translation>Kodierung</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
         <translation>Hextile-Kodierung</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
         <translation>CoRRe-Kodierung</translation>
     </message>
     <message>
         <source>RRE encoding</source>
         <translation>RRE-Kodierung</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation>&quot;Copy rectangle&quot;-Kodierung</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
         <translation>Password des VNC-Servers</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation>Passwort verschleiern</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
         <translation>Name des VNC-Servers</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
         <translation>Rechnername des VNC-Servers</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
         <translation>Displaynumemr des VNC-Servers</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation>Verzögerung zwischen den Aktualisierungsanforderungen vom Server</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation>Anforderung für 8bit Farb-Transfer des VNC-Servers</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
         <translation>Erlaube anderen Anwendern auf den VNC-Server zu verbinden</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
         <translation>Skalierung der Anzeige so dass sie auf den PDA passt (langsamere Darstellung)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation>Ermöglichung der Übertragung identischer Rechtecke als Referenzen auf exisitierende Daten</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index c600f7b..6ae327a 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -1,249 +1,245 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Richtungstasten ändern</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Unbelegte Taste</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Ruhmeshalle</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quit</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Mauscursor verstecken</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Graphisches Theme verstecken</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pause im Hintergrund</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Fortsetzen im Vordergrund</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>&amp;Tasten ändern ...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@-@VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 Ein Pacmanspiel für den KDE-Desktop
 
 Das Spiel basiert auf den Quellen von ksnake
 von Michel Filippi (mfilippi@sade.rhein-main.de)
 Das Design wurde stark beeinflusst durch Pacman
 (c) 1980 MIDWAY MFG.CO
 
 Ich danke meiner Freundin Elke Krueers für
 die letzten 10 Jahre Ihrer Freundschaft.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>Konfigurationsfehler</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation>Es sind keine Schemata definiert oder es wurde keines ausgewählt.</translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Der BitFont konnte nicht erstellt werden.
 
 Die Datei &apos;@FONTNAME@&apos; exisitiert nicht
 oder iist in einem unbekannten Format.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>GAME OVER</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>SPIELER 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>FERTIG!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>CHARAKTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SPITZNAME</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORTIERUNG: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>CURSOR DRÜCKEN ZUM STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>GRATULATION</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>SIE HABEN EINEN</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>PLATZ IN DER TOP10 ERREICHT.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNG   PKTE     NAME    DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Die Graphik konnte nicht aufgebaut werden.
 
 Die Datei &apos;@PIXMAPNAME@&apos; existiert nicht.
 oder ist in einem unbekannten Format.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initializierungsfehler</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/launchersettings.ts b/i18n/de/launchersettings.ts
index e170eb0..89b09e2 100644
--- a/i18n/de/launchersettings.ts
+++ b/i18n/de/launchersettings.ts
@@ -1,209 +1,209 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launchereinstellungen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menü</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Lädt Applets im O-Menü:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Zeigt Launcher-Reiter im O-Menü</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Wählen Sie die Applets, die Sie im O-Menü angezeigt haben möchten.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Fügt die Inhalte der Launcher-Reiter als Menüs in das O-Menü ein.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Beispiel 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Beispiel 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Beispiel 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Reiter bearbeiten</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Symbole</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vorschau %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Dies ist eine grobe Vorschau wie der gewählte Reiter aussehen wird.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Benutzerdefinierte Schrift</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Ruled</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Einfarbig</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bild</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Auswählen...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Größe:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Farbe: </translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher-Reiter: </translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>LÖschen</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Großen &quot;Busy Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Blinkenden &quot;Busy-Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Wählen Sie den Reiter den Sie bearbeiten oder Löschen möchten.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Fügt einen neuen Reiter in den Launcher ein.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Öffnet einen neuen Dialog um den gewählten Reiter zu bearbeiten.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Löscht einen Reiter aus dem Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in Bildschirmmitte möchten anstatt der in der Taskbar.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in der Taskbar möchten.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>All Reiter</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Noch nicht implementiert</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Applets in die Taskbar laden:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Wählen Sie die Applets, die Sie in der Taskbar angezeigt haben möchten.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/sfcave-sdl.ts b/i18n/de/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/da/sfcave-sdl.ts
+++ b/i18n/de/lib.ts
diff --git a/i18n/de/libbatteryapplet-ipaq.ts b/i18n/de/libbatteryapplet-ipaq.ts
deleted file mode 100644
index b5798d0..0000000
--- a/i18n/de/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Batteriestatus für den iPAQ</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation>konnte Datei nicht öffnen</translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation>Beide Einheiten werden geladen</translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation>Lade...</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>Verbleibende Energie in Prozent:</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>Batteriestatus:</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>Gut</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>Niedrig</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>Sehr niedrig</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>Kritisch</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>Unbekannt</translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation>Ersatzversorgung</translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation>Netzbetrieb</translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation>Externe Stromquelle nicht mehr verbuden</translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation>Verbleibende Batteriezeit</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>Verbleibende Energie in Prozent:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>Verbleibende Batteriezeit:</translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation>Keine Zusatzbatterie angeschlossen</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Schließen</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/libclockapplet.ts b/i18n/de/libclockapplet.ts
index 4eb9e18..8545f2b 100644
--- a/i18n/de/libclockapplet.ts
+++ b/i18n/de/libclockapplet.ts
@@ -1,2 +1,15 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Information</source>
+        <translation type="obsolete">Informationen</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Die Systemzeit scheint ungültig zu sein.
+(%1)&lt;/p&gt;&lt;p&gt;Wollen Sie die Systemzeit ändern?&lt;/p&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libdialup.ts b/i18n/de/libdialup.ts
deleted file mode 100644
index 51ed1f8..0000000
--- a/i18n/de/libdialup.ts
+++ b/dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation>Einwählen</translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Zugang</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Benutzername: </translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passwort: </translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Telefon: </translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Name: </translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation>Mode,</translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation>AT-Wahl: </translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation>ATDT</translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation>ATDP</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Geschw.: </translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation>4800</translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation>9600</translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation>19200</translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation>38400</translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation>57600</translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation>115200</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Warteteit: </translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation>Sek</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Flow control: </translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Hardware flow control</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Wahl bei Bedarf</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Manueller Auf- und Abbau</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation>Sekunden</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Idle Timeout:</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Automatischer Auf- und Abbau</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Manueller Auf-, automatischer Abbau</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Netzwerk</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Erkennung Nameserver</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Gateway</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Erkennung Router</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Erster DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Zweiter DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation>Gerät: </translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation>IrDA</translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation>PCMCIA</translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation>Seriell</translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>Warten auf Aktivität</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Modeminitialisierung</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>Verbinden</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Anmelden</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Kein Wählton</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Kein Träger</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Anschluss ist belegt</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Timed out</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Verbindung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Anmeldung fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Verbunden</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Proxy Einstellung</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Kein Proxy</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Automatische Proxies</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Proxies setzen</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Konfiguration: </translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port: </translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP: </translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP: </translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Rechner: </translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Kein Proxy für: </translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/libflatstyle.ts b/i18n/de/libflatstyle.ts
index 4eb9e18..6cdb545 100644
--- a/i18n/de/libflatstyle.ts
+++ b/i18n/de/libflatstyle.ts
@@ -1,2 +1,11 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Flat</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libinterfaces.ts b/i18n/de/libinterfaces.ts
index 3234ce4..6615d55 100644
--- a/i18n/de/libinterfaces.ts
+++ b/i18n/de/libinterfaces.ts
@@ -1,155 +1,163 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Erweiterte Information</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnetzmaske</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>DHCP Information</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>DHCP Server</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Lease Expires</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Lease Obtained</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC-Addresse</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Interface-Information</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Refreshen</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>Neu&amp;estart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnetz-Maske</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC Addresse</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:0</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>An&amp;zeige erweiterter Informationen</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Interface-Konfiguration</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Automatisch starten</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Statische IP-Adressen</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnetz-Maske</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Erster DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Zweiter DNS</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished">00:00:00:00:00:0 {255.255.255.0?}</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation> Interface-Neustart</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libkeyview.ts b/i18n/de/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/de/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/libkppp.ts b/i18n/de/libkppp.ts
new file mode 100644
index 0000000..eb0fe65
--- a/dev/null
+++ b/i18n/de/libkppp.ts
@@ -0,0 +1,1430 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="obsolete">&amp;Editieren...</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation>Ermöglicht die Modifikation des Zugangs</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="obsolete">&amp;Neu...</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation>Erstellung einer neuen Wählverbindung
+ins Internet</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="obsolete">Ko&amp;pieren</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation>Erstellt eine Kopie des gewählten Zugangs. Alle
+Einstellungen des selektierten Zugangs werden in einen
+neuen Zugang kopiert, der modifiziert werden kann</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="obsolete">L&amp;öschen</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Löscht den gewählten Zugang
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>Maximum number of accounts reached.</source>
+        <translation type="obsolete">Maximale Anzahl Zugänge erreicht.</translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation>Kein Zugang gewählt.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation>Sich Sie sicher den Zugang &quot;%1&quot; löschen 
+zu wollen ?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Bestätigen</translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation>Neuer Zugang</translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation>Zugang Bearbeiten: </translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation>Wählen</translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation>Login Script editieren</translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation>Authentisierung</translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation>IP Einstellung</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation>Gateway Setup</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Gateway</translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation>DNS Server</translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation>DNS</translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation>Programme ausführen</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Ausführen</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation>Sie müssen einen eindeutigen Zugangsnamen angeben</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="obsolete">Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="obsolete">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="obsolete">GB</translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation>Authentisierung:</translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation>Script basiter</translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation>PAP</translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation>
+Terminal basiert</translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation>CHAP</translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation>PAP/CHAP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation>&lt;p&gt;Spezifiziert die Methode die benutzt wird um Sie am
+PPP-Server zu identifizieren. Die meisten Hochschulen nutzen
+nach wie vor &lt;b&gt;Terminal&lt;/b&gt; oder &lt;b&gt;Script&lt;/b&gt; basierte 
+Authentisierung während die meisten ISPs &lt;b&gt;PAP&lt;/b&gt; oder &lt;b&gt;CHAP&lt;/b&gt; 
+verwenden. Wenn Sie unsicher sind fragen Sie Ihren ISP.
+
+Wenn Sie zwischen PAP oder CHAP wählen können nehmen Sie CHAP- 
+es ist sicherer. Wenn Sie nicht wissen ob PAP oder CHAP notwendig ist 
+wählen Sie PAP/CHAP.</translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation>Nutzername: </translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation>Geben Sie Ihren Nutzernamen hier ein...</translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation>Passwort: </translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation>Geben Sie Ihr Passwort hier ein</translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation>Passwort speichern</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation>&lt;p&gt;Ist diese Option aktiviert wird Ihr ISP
+Passwort in der Konfiguration gespeichert, so
+dass Sie es nicht mehrmals einbgeben müssen.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warnung:&lt;/font&gt; )Ihr Passwort 
+wird im Klartext in einer Datei gespeichert, welche
+nur von Ihnen lesbar ist. Stellen Sie sicher, dass 
+niemand anders Zugang dazu erhält !
+</translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation>&lt;qt&gt;Login script hat eine asynchrone Start/Stop-Schleife&lt;/qt&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Editieren...</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation>&amp;Neu...</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation>Ko&amp;pieren</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation>L&amp;öschen</translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation>Domain Name:</translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation>Wenn Sie einen Domainnamen hier angeben
+wird dieser Domainname für Ihren Computer 
+verwendet  während Sie verbunden sind.
+Wird die Verbindung beendet wird der 
+Originalname Ihres Computer wieder eingestellt.
+
+Lassen Sie dieses Feld leer wenn keine Änderung
+Ihres Domainnamens notwendig ist.</translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation>Konfiguration:</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Manuell</translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation>DNS IP Addresse:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Ermöglicht die Angabe eines DNS-server der
+verwendet wird solange die Verbindung steht. Wird die 
+Verbindung beendet  wird auch der DNS-Eintrag wieder 
+entfernt.
+
+Um einen DNS hinzuzufügen geben Sie eine IP-Adresse
+des DNS an und klicken Sie &lt;b&gt;Hinzu&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzu</translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation>Klicken Sie diesen Schalter um den DNS
+aus dem obigen Feld hinzuzufügen.
+Der Eintrag wird zur unteren Liste gefügt</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation>Klicken Sie diesen Schalter um den gewählten DNS
+aus der Liste zu entfernen</translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation>DNS Adressliste: </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation>&lt;p&gt;Dies zeigt alle definierten DNS die verwendet
+werden während Sie verbunden sind. Benutzen Sie 
+die Schalter &lt;b&gt;Hinzu&lt;/b&gt; und &lt;b&gt;Entfernen&lt;/b&gt; um 
+die Liste zu verändern</translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation>DNS deaktivieren während einer Verbindung</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation>&lt;p&gt; Ist diese Option aktiviert werden alle
+SND aus der &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; temporär deaktiviert
+während die Wählverbindung aufgebaut ist. Nach  
+Verbindungsende werden die Server wieder reaktiviert.
+
+Typischerweise gibt es keinen Grund diese Option
+zu verwenden, dennoch kann es unter Umständen
+sinnvoll sein.</translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="obsolete">Ermöglicht die Modifikation des Zugangs</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="obsolete">Erstellung einer neuen Wählverbindung
+ins Internet</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="obsolete">Erstellt eine Kopie des gewählten Zugangs. Alle
+Einstellungen des selektierten Zugangs werden in einen
+neuen Zugang kopiert, der modifiziert werden kann</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Löscht den gewählten Zugang
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>No devices selected.</source>
+        <translation>Kein Gerät ausgewählt.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation>Sind Sie sicher, dass sie das Gerät
+&quot;%1&quot; löschen wollen?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Bestätigen</translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation>Neues Gerät</translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation>Gerät bearbeiten:</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation>&amp;Gerät</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation>&amp;Modem</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="obsolete">Sie müssen einen eindeutigen Zugangsnamen angeben</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation>Ermöglicht die Modifikation des Geräts</translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation>Neues Gerät erstellen</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation>Erstellt eine Kopie des gewählten Geräts. Alle
+Einstellungen des selektierten Geräts werden in ein
+neues Gerät kopiert, das modifiziert werden kann</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Löscht das gewählte Zugang
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished">Sie müssen einen eindeutigen Gerätnamen angeben</translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation>Verbindungsname:</translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation>Geben Sie einene eindeutigen Namen an</translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation>Tel. Nummer:</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation>&amp;Hinzu...</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Entfernen</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation>&lt;p&gt;Gibt die zu wählende Telefonnummer an.
+Sie können hier mehrere Nummern angeben
+durhc Verwenden von &quot;Hinzu&quot;. Sie können die
+Reihenfolge der zu verwendenen Nummern ändern,
+indem sie die Pfeil-Tasten verwenden.
+
+Ist eine Nummer besetzt oder ungültig wird &lt;i&gt;kppp&lt;/I&gt; 
+die nächste Nummer versuchen</translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation>pppd-Parameter spezifizieren...</translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation>Hier können Befehle eingegeben werden die 
+in unterschieldichen Stufen des Verbindungsaufbaus
+ausgeführt werden.
+Befehle die root-Rechte benötigen können nicht 
+verwendet werden, solange Sie nicht als root angemeldet sind.</translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation>Vor der Verbindung:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;bevor&lt;/b&gt; 
+eine Verbindung aufgebaut wird. Es wird unmittelbar 
+aufgerufen bevor der Wählvorgang initiiert wird.
+
+Das kann bspw. notwendig sein um Programme zu stoppen 
+die das Modem blockieren.</translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation>Bei Verbindung:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;nachdem&lt;/b&gt; 
+eine Verbindung aufgebaut wird. Zu diesem Zeitpunkt besteht 
+bereits eine Internetverbindung.
+
+Sehr nützlich um bspw. Mail und News zu holen</translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation>Vor dem Verbindungsabbau:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;bevor&lt;/b&gt; 
+eine Verbindung abgebaut wird. Die Verbindung bleibt
+bestehen bis das Programm beendet ist.</translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation>Bei Verbindungsabbau:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation>Ermöglicht das Ausführen eines Programms &lt;b&gt;nachdem&lt;/b&gt; 
+eine Verbindung abgebaut ist.</translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation>Default Gateway</translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation>Dies lässt die PPP-Gegenstelle als Router auftreten.
+
+Dies ist normal für die meisten ISPs, daher sollte diese 
+Option normalerweise angeschaltet sein.</translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation>Statisches Gateway</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation>&lt;p&gt;Ermöglicht die Angabe eines Routers (s.
+&lt;i&gt;Default Gateway&lt;/i&gt;)</translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation>Gateway IP Addresse:</translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation>Setzen der Default Route für dieses Gateway</translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation>Ist diese Option angeschaltet werden alle 
+Pakete die nicht ins lokale Netz gehen über PPP
+geroutet.
+
+Normalerweise sollte diese Aoption einschaltet sein</translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation>Dynamische IP Addresse</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation>Wählen Sie diese Option wenn Ihr Rechner
+automatisch eine IP-Adresse vom ISP bei 
+Verbindungsaufbau bezieht.
+
+Die meisten ISPs benutzen diese Option.</translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation>Statische IP Adresse</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation>Wählen Sie diese Option wenn Ihr Rechner eine
+statische IP-Adresse besitzt. Dies ist nicht die Regel,
+so dass es eine gute Idee ist dynamische Adressen
+zu verwenden.</translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation>IP Adresse:</translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation>Hat Ihr Rechner eine permanente Verbindung
+ins Internet muss die Adresse hier angegebn werden.</translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation>Subnetzmaske:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation>&lt;p&gt;Hat Ihr Rechner eine statische Internet-Adresse
+muss die Netzwerkmaske hier angegeben werden. In den 
+meisten Fällen ist dies &lt;b&gt;255.255.255.0&lt;/b&gt;, dies kann jedoch 
+auch anders sein.
+
+Wenn Sie unsicher sind kontaktieren Sie Ihren ISP</translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation>Hostnamen-Autokonfiguration</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Warnung</translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation>Kein Passwort</translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation>Nutzername vorhanden aber kein Passwort
+Bitte Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation>Modem &amp;name:</translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation>pppd-Parameter spezifizieren</translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzu</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation>Tel. Nummer hinzufügen</translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation>Bitte Tel. Nummer eingeben:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished">Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished">GB</translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished">&lt;p&gt;Löscht das gewählte Gerät
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation>Hinzu</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Einfügen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index 5ead0c0..a5d2504 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Keine Transparenz</translation>
+        <translation type="unfinished">Kein Durchscheinen</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Stippled, Hintergrundfarbe</translation>
+        <translation type="unfinished">getüpfelte Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Stippled, Buttonfarbe</translation>
+        <translation type="unfinished">getüpfelte Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Transparent stippled, Hintergrundfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Transparent stippled, Buttonfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Nutzerdefinierte Transparenz</translation>
+        <translation type="unfinished">Benutzerdef. Durchscheinen</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menüfarbe</translation>
+        <translation type="unfinished">Menüfarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished">Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished">TRansparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menütext nutzen</translation>
+        <translation type="unfinished">Schattierten Menutext verwenden</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Werkzeugleisten erscheinen flach</translation>
+        <translation type="unfinished">Flache Werkzeugleistenbuttons</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Stipplekontrast</translation>
+        <translation type="unfinished">getüpfelter Kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Hochperformanter Liquidstil von Mosfet</translation>
+        <translation type="unfinished">Hoch perfomanter Liquid-Stil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmail.ts b/i18n/de/libmail.ts
index 23acb04..b21ec69 100644
--- a/i18n/de/libmail.ts
+++ b/i18n/de/libmail.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MailFactory</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Datei &apos;%1&apos; konnte nicht angehängt werden. Fortfahren oder abbrechen?&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Konnte Datei &apos;%1&apos; nicht anhängen. Fortfahren oder Abbrechen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation>Forfahren</translation>
+        <translation>Fortdahren</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>SmtpHandler</name>
     <message>
         <source>Looking up host...</source>
-        <translation>Suche nach Host...</translation>
+        <translation>Suche host...</translation>
     </message>
     <message>
         <source>The server refused the connection.</source>
         <translation>Der Server hat die Verbindung abgelehnt.</translation>
     </message>
     <message>
         <source>Host lookup failed.</source>
-        <translation>Serversuche gescheitert.</translation>
+        <translation>Die Host-Suche ist fehlgeschlagen.</translation>
     </message>
     <message>
         <source>The read from the socket failed for an unknown reason.</source>
-        <translation>Das Lesen vom Socket ist aus unbekanntem Grund fehlgeschlagen.</translation>
+        <translation>Das Lesen vom Socket ist aus unerklärlichen Gründen gescheitert.</translation>
     </message>
     <message>
         <source>The sending failed for an unknown reason.</source>
-        <translation>Das Versenden ist aus unbekanntem Grund fehlgeschlagen.</translation>
+        <translation>Das Sending ist aus unbekannten Gründen fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Host found.</source>
         <translation>Host gefunden.</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Verbunden mit %1</translation>
     </message>
     <message>
         <source>SMTP &gt; %3</source>
         <translation>SMTP &gt; %3</translation>
     </message>
     <message>
         <source>SMTP&gt; EHLO *</source>
-        <translation>SMTP &gt; EHLO *</translation>
+        <translation>SMTP&gt; EHLO *</translation>
     </message>
     <message>
         <source>SMTP&gt; AUTH CRAM-MD5</source>
-        <translation>SMTP &gt; AUTH CRAM-MD5</translation>
+        <translation>SMTP&gt; AUTH CRAM-MD5</translation>
     </message>
     <message>
         <source>SMTP&gt; Authenticating</source>
-        <translation>SMTP &gt; Authenticating</translation>
+        <translation>SMTP&gt; Authenticating</translation>
     </message>
     <message>
         <source>SMTP&gt; HELO *</source>
-        <translation>SMTP &gt; HELO *</translation>
+        <translation>SMTP&gt; HELO *</translation>
     </message>
     <message>
         <source>SMTP&gt; MAIL FROM: *</source>
-        <translation>SMTP &gt; MAIL FROM: *</translation>
+        <translation></translation>
     </message>
     <message>
         <source>SMTP&gt; RCPT TO: *</source>
-        <translation>SMTP &gt; RCPT TO: *</translation>
+        <translation>SMTP&gt; RCPT TO: *</translation>
     </message>
     <message>
         <source>SMTP&gt; DATA</source>
-        <translation>SMTP &gt; DATA</translation>
+        <translation>SMTP&gt; DATA</translation>
     </message>
     <message>
         <source>SMTP&gt; Sending data...</source>
-        <translation>SMTP &gt; Sending Data...</translation>
+        <translation>SMTP&gt; Versende Daten...</translation>
     </message>
     <message>
         <source>SMTP&gt; QUIT (Done)</source>
-        <translation>SMTP &gt; QUIT (Done)</translation>
+        <translation>SMTP&gt; QUIT (Done)</translation>
     </message>
     <message>
         <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
-        <translation>Der Server hat einen Fehler gemeldet. Die Fehlernachricht lautet:&lt;br&gt;%1</translation>
+        <translation>Der Server hat einen Fehler zurückgegeben. Das ist die Nachricht:&lt;br&gt;%1</translation>
     </message>
     <message>
         <source>SMTP &lt; %3</source>
-        <translation>SMTP &gt; %3</translation>
+        <translation>SMTP &lt; %3</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libfreetypefactory.ts b/i18n/de/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/de/libfreetypefactory.ts
+++ b/i18n/de/libmodplugin.ts
diff --git a/i18n/de/libnetmonapplet.ts b/i18n/de/libnetmonapplet.ts
deleted file mode 100644
index e41d06c..0000000
--- a/i18n/de/libnetmonapplet.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation>Netzwork offline</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation>Nicht verbunden</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Verbinde</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation>Passwort Netzwerk</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Verbinde</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation>Passwort für %1: </translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/libnotesapplet.ts b/i18n/de/libnotesapplet.ts
index 97c5623..a4ae06d 100644
--- a/i18n/de/libnotesapplet.ts
+++ b/i18n/de/libnotesapplet.ts
@@ -1,46 +1,46 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>NotesControl</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Delete?</source>
         <translation>Löschen?</translation>
     </message>
     <message>
         <source>Do you really want to&lt;BR&gt;&lt;B&gt; delete&lt;/B&gt; this note ?</source>
-        <translation>Soll diese Notiz wirklich&lt;br&gt;&lt;b&gt;gelöscht&lt;/b&gt;werden?</translation>
+        <translation>Möchten sie wirklich diese Notiz löschen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Beam Out</source>
-        <translation>Versenden</translation>
+        <translation>Beamen</translation>
     </message>
     <message>
         <source>Search For...</source>
-        <translation>Suche nach...</translation>
+        <translation>Suchen nach...</translation>
     </message>
     <message>
         <source>Toggle Maximized</source>
-        <translation>Maximiert umschalten</translation>
+        <translation>(de)maximiere</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopie.ts b/i18n/de/libopie.ts
index 825fac4..109ef21 100644
--- a/i18n/de/libopie.ts
+++ b/i18n/de/libopie.ts
@@ -1,609 +1,675 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Kalendarknopf</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Kontaktknopf</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Menüknopf</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Bildschirm Rotierung</translation>
     </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mehr</translation>
     </message>
     <message>
         <source>More...</source>
         <translation>Mehr...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Öfnnen</translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
-        <source>Documents</source>
-        <translation>Dokumente</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation>Dateien</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation>All Dateien</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>Alles</translation>
-    </message>
-    <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Speichern</translation>
-    </message>
-    <message>
-        <source>C&amp;ancel</source>
-        <translation>&amp;Abbrechen</translation>
-    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Dateityp</translation>
     </message>
-    <message>
-        <source>Ser Permission</source>
-        <translation>Rechte setzen</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation>Möchten sie wirklich löschen
-</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nein</translation>
-    </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mittel</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
 </context>
 <context>
     <name>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>Die Liebe Kleine Zecke übersetzt ins Deutsche</translation>
+        <translation>Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Wiederholung an</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Kein Enddatum</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>Tage</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>Tag</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>Wochen</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>Woche</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>Monate</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>Monat</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>Jahre</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>Jahr</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>und </translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+und</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, and</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Keine Wiederholung</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>Tag(e)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Wiederholung an</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Mon</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Di</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Mi</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Fr</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sa</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>So</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>Woche(n)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Wiederholen bis</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Tag</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>Monat(e)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>Jahr(e)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Jeden</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Zeit auswählen:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Summary:</source>
-        <translation>Zusammenfassung:</translation>
-    </message>
-    <message>
         <source>Description:</source>
-        <translation>Beschreibung:</translation>
+        <translation type="obsolete">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
-        <translation>Stand. Email: </translation>
+        <translation>Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>GEchäftshandy: </translation>
+        <translation>Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Geschäftspiepser: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
+        <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Private Webseiten: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Privates Telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Privates Fax: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Privates Handy: </translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mann</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Frau</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Ehepartner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Kinder: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 jeden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 jeden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
-        <translation>Den %1 %1 of jeden</translation>
+        <translation type="obsolete">Den %1 %1 of jeden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
     <message>
-        <source>No End Date</source>
-        <translation>Kein Enddatum</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation>Tage</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation>Wochen</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation>Woche</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation>Monate</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation>Monat</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation>Jahre</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation>Jahr</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation>und </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation>,
-und</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation>, and</translation>
+        <source>Start:</source>
+        <translation>Start:</translation>
     </message>
     <message>
-        <source>No Repeat</source>
-        <translation>Keine Wiederholung</translation>
+        <source>End:</source>
+        <translation>Ende:</translation>
     </message>
     <message>
-        <source>day(s)</source>
-        <translation>Tag(e)</translation>
+        <source>Note:</source>
+        <translation>Notiz:</translation>
     </message>
     <message>
-        <source>Repeat On</source>
-        <translation>Wiederholung an</translation>
+        <source>Documents</source>
+        <translation>Dokumente</translation>
     </message>
     <message>
-        <source>Mon</source>
-        <translation>Mon</translation>
+        <source>Files</source>
+        <translation>Dateien</translation>
     </message>
     <message>
-        <source>Tue</source>
-        <translation>Di</translation>
+        <source>All Files</source>
+        <translation>All Dateien</translation>
     </message>
     <message>
-        <source>Wed</source>
-        <translation>Mi</translation>
+        <source>Very high</source>
+        <translation>Sehr hoch</translation>
     </message>
     <message>
-        <source>Thu</source>
-        <translation>Do</translation>
+        <source>High</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <source>Fri</source>
-        <translation>Fr</translation>
+        <source>Normal</source>
+        <translation>Normal</translation>
     </message>
     <message>
-        <source>Sat</source>
-        <translation>Sa</translation>
+        <source>Low</source>
+        <translation>Niedrig</translation>
     </message>
     <message>
-        <source>Sun</source>
-        <translation>So</translation>
+        <source>Very low</source>
+        <translation>Sehr niedrig</translation>
     </message>
     <message>
-        <source>week(s)</source>
-        <translation>Woche(n)</translation>
+        <source>Location:</source>
+        <translation>Ort:</translation>
     </message>
     <message>
-        <source>Repeat By</source>
-        <translation>Wiederholen bis</translation>
+        <source>This is an all day event</source>
+        <translation>Das ist ein Termin ohne Zeit</translation>
     </message>
     <message>
-        <source>Day</source>
-        <translation>Tag</translation>
+        <source>This is a multiple day event</source>
+        <translation>Das ist ein mehrtägiger Termin</translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>Datum</translation>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>month(s)</source>
-        <translation>Monat(e)</translation>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>year(s)</source>
-        <translation>Jahr(e)</translation>
+        <source>The %1 %2 of every</source>
+        <translation>Den %1 %2 jedes</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation>.</translation>
+        <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
-        <translation>.</translation>
+        <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
-        <translation>.</translation>
+        <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
-        <translation>.</translation>
+        <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopieobex.ts b/i18n/de/libopieobex.ts
index d12ddfb..0220da6 100644
--- a/i18n/de/libopieobex.ts
+++ b/i18n/de/libopieobex.ts
@@ -1,125 +1,77 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">OBEX Übertragung</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Versende: </translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">Dateiname</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Abbrechen</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">OBEX Emfang</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">Textlabel1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Dateiname</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Eine Datei wurde Ihnen 
-zugesendet.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Einfügen</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Ablehnen</translation>
-    </message>
-</context>
-<context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;b&gt;Empfangen:&lt;/b&gt;&lt;/qt&gt;</translation>
+        <translation>&lt;qt&gt;&lt;b&gt;Bekommen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation>Annehmen</translation>
+        <translation>Akpezptieren</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Ablehnen</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation>&lt;p&gt;Eine Datei vom Typ %1 (&lt;img src=&quot;%2&quot;&gt;) wurde empfangen.</translation>
+        <translation>&lt;p&gt;Sie haben eine Datei vom Typ %1 ( &lt;img src=&quot;%2&quot;&gt; ) erhalten. Was möchten sie tun?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Sende:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Fertig</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa ist nicht aktiviert.</translation>
+        <translation>Infrarot ist nicht verfügbar!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Suche nach IrDa-Geräten.</translation>
+        <translation>Suche nach Infrarot-Geräten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth ist nicht verfügbar.</translation>
+        <translation>Bluetooth is nicht verfügbar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Suche nach Bluetooth-Geräten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Plane für Versand.</translation>
+        <translation>beginne zu beamen.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klicken Sie zum Versenden</translation>
+        <translation>Clicke um zu senden</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation>Versandt</translation>
+        <translation>Gesendet</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation>Fehlgeschlagen</translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Versuch %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Wiederhole Suche nach IrDa.</translation>
+        <translation>Suche nochmals für Infrarot-Geräte.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation>Beginne Versand</translation>
+        <translation>Beginne zu senden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index 64ae242..d5a0d97 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -1,905 +1,962 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Geschäftlich</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Privat</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Mehrere)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Neue Kategorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Neue Kategorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategorie bearbeiten</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorien</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Anwendung</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorien hier hinein</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Überprüfen Sie die Kategorie zu der dieses Dokument gehört.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Bitte geben Sie eine neue Kategorie ein. Drücken Sie &lt;b&gt;Neu&lt;/b&gt; um sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Sie können links eine neue Kategorie einfügen und durch Drücken von &lt;b&gt;Neu&lt;/b&gt; sie zur Liste hinzuzufügen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Hier drücken, um eine ausgewählte Kategorie zu entfernen.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Auswählen um diese Eigenschaft allen Anwendungen verfügbar zu machen.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugewiesen</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Eine andere Anwendung bearbeitet gerade 
 die Kategorien.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategorien bearbeiten</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Januar des ausgewählten Jahres anzeigen</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Vorherigen Monat anzeigen</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Nächsten Monat anzeigen</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
-        <translation>Dezember des ausgewälten Jahres anzeigen</translation>
+        <translation>Dezember des ausgewählten Jahres anzeigen</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
-        <translation>Filedialog schliessen</translation>
+        <translation>Dateidialog schließen</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Dokumente dieses Typs anzeigen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Dokumente dieser Kategorie anzeigen</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klicken, um ein Dokument aus der Liste auszuwählen</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, oder wählen Sie &lt;b&gt;Neues Dokument&lt;/b&gt;, um ein neues Dokument zu erstellen.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Klicken und Halten für die Dokumenteigenschaften.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Text nicht gefunden</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Ende erreicht, zurück zum Anfang</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Suchen nach: </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie: </translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Suche starten bei: </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>2. Dez. 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Rückwärts suchen</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie von</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Löschen fehlgeschlagen</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschieben nicht möglich</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschaften</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Kommentar: </translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ: </translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name: </translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort: </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Schnellladen (benötigt Speicher)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Beamen</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Das Medium auf dem sich das Dokument befindet</translation>
     </message>
     <message>
         <source>The name of this document.</source>
-        <translation>Der Dokumentenname</translation>
+        <translation>Der Dokumentname</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Vorsorgliches Laden der Anwendung für schnellere Verfügbarkeit.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Dokument löschen</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Dokument kopieren</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Dokument auf ein anderes Gerät beamen.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Anwendungsspezifische Rotation</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Benutzerinformationen</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation>OK</translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nein</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Speicher erschöpft</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ein Problem beim Erstellen 
 der Konfigurationsinformationen ist aufgetreten. 
 Bitte machen Sie entsprechenden Speicher frei 
 und versuchen Sie es noch einmal.
 </translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Erstellen der Startdateien nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
     <message>
         <source>D</source>
         <translation>T</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Wollen Sie %1 wirklich entfernen ?</translation>
+        <translation type="obsolete">Wollen Sie %1 wirklich entfernen ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugeordnet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse gesch.&lt;/b&gt;: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse priv.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Mail Adresse: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tel. priv.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax priv.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Handy priv.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web priv.: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web gesch.: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Gesch.Tel.: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Gesch. Fax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Gesch. Handy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Gesch. Pager:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beruf: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Vorgesetzter: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Männlich</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Weiblich</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geschlecht: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Partner: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Geburtstag: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jahrestag: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Spitzname: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Zweitname</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ablegen als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standardmail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Mailadressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tel. priv.</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax priv.</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Handy priv.</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Strasse gesch.</translation>
+        <translation>Straße gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Stadt gesch.</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Land gesch.</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>PLZ gesch.</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Staat gesch.</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper gesch.</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web gesch.</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Vorgestzter</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Strasse priv.</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Stadt priv.</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Land priv.</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>PLZ priv.</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Staat priv.</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web priv.</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Partner</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinder</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Neues Dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Die</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mit</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Don</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Son</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation>%1 Dokument</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu verwerfen.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Klicken Sie hier, um das Fenster zu schließen.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Klicken sie hier, um das Fenster zu maximieren.</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;Keine allgemeine Hilfe vorhanden- bitte benutzen Sie die kontextsensitve Hilfe:&lt;p&gt;Um kontextsensitive Hilfe zu verwenden: &lt;p&gt;&lt;ol&gt;&lt;li&gt;Klicken und halten Sie den Stift auf dem Hilfebutton.&lt;li&gt;Wenn die Titelzeile &lt;b&gt;What&apos;s this...&lt;/b&gt; anzeigt können Sie auf ein beliebiges Objekt klicken um die zugehörige Hilfe zu erhalten.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+        <translation>&lt;Qt&gt;Keine allgemeine Hilfe vorhanden- bitte benutzen Sie die kontextsensitve Hilfe:&lt;p&gt;Um kontextsensitive Hilfe zu verwenden: &lt;p&gt;&lt;ol&gt;&lt;li&gt;Klicken und halten Sie den Stift auf dem Hilfeknopf.&lt;li&gt;Wenn die Titelzeile &lt;b&gt;What&apos;s this...&lt;/b&gt; anzeigt können Sie auf ein beliebiges Objekt klicken um die zugehörige Hilfe zu erhalten.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Was ist das...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schliessen und alle Änderungen zu verwerfen.</translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Sind Sie sicher, dass die %1 löschen wollen?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schliessen.</translation>
+        <source>Jan</source>
+        <translation>Jan</translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation>Klicken Sie hier, um das Fenster zu schliessen und alle Änderungen zu akzeptieren.</translation>
+        <source>Feb</source>
+        <translation>Feb</translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation>Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
+        <source>Mar</source>
+        <translation>Mär</translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation>Klicken sie hier, um das Fenster zu maximieren.</translation>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Aug</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Okt</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dez</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 Dokument</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF-Karte</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Festplatte</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD-Karte</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Festplatte</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>interner Speicher</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>interner Hauptspeicher</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC-Karte</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Citytime-Programm nicht gefunden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Bitte installieren Sie opie-citytime 
 zur Einstellung der Zeitzonen.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Kein Speicher vorhanden</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 Dateien</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1-Dateien</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libsdmonapplet.ts b/i18n/de/libsdmonapplet.ts
deleted file mode 100644
index 20d08fc..0000000
--- a/i18n/de/libsdmonapplet.ts
+++ b/dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation>Karte auswerfen</translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation>SDMonitor</translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation>Kartenauswurf fehlgeschlagen!</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/libtheme.ts b/i18n/de/libtheme.ts
index 0886ae3..3824c83 100644
--- a/i18n/de/libtheme.ts
+++ b/i18n/de/libtheme.ts
@@ -1,36 +1,37 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation>Schema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
         <translation>KDE2-Themes kompatible Stil-Engine</translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
-        <translation type='unfinished'>Schema</translation>
+        <translation>Schema</translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
-        <translation>W�hlen Sie das Schema aus, welches benutzt werden soll</translation>
+        <translation>W�len Sie das Schema aus, welches benutzt werden soll</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>[No theme]</source>
         <translation>[keine Schema]</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtinykate.ts b/i18n/de/libtinykate.ts
index 64ed990..44de66b 100644
--- a/i18n/de/libtinykate.ts
+++ b/i18n/de/libtinykate.ts
@@ -1,23 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation>Kein Speicherplatz verfügbar</translation>
+        <translation>Kein Platz mehr verfügbar</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation>Es ist ein Problem beim Erstellen
-der Konfigurationsdatei aufgetreten.
-
-Bitte machen Sie Speicher frei und
-versuchen Sie es erneut.</translation>
+        <translation>Das erstellen von KateConfiguration Informationen
+ist gescheitert. Bitte machen sie Speicher frei
+und probieren sie es noch ein Mal.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodayaddressbookplugin.ts b/i18n/de/libtodayaddressbookplugin.ts
index 3dc4d2d..ce80b73 100644
--- a/i18n/de/libtodayaddressbookplugin.ts
+++ b/i18n/de/libtodayaddressbookplugin.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Anzahl. Einträge: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Setzt die maximale Anzahl an Einträgen imgegeben Zeitraum</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Zeile abschneiden nach N Einträgen: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Nach wie vielen Zeichen soll Zeiel abgeschnitten werden</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Vorausschai in Tagen :</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Wieviele Tage soll vorau geschaut werden</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Einstellungen aktivieren: Anwendung neu starten !</translation>
+        <translation type="obsolete">Einstellungen aktivieren: Anwendung neu starten !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Überschriftenfarbe: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Farbe der Überschrift !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Einstragsfarbe: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Die Farbe des Eintrags selbs !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Setzt die Farbe für
 fällige Termine</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Tage: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin kurz bevorsteht !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin näher ist als der eingestellte Zeitraum !</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Addressbuch-Plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Geburtstage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Geburtstage in  &lt;b&gt;%1&lt;/b&gt; Tagen!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Die Datenbank kann die Anfrage nicht durchführen. Vermutlich muss das libopie-Paket upgegradet werden ! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodaydatebookplugin.ts b/i18n/de/libtodaydatebookplugin.ts
index 0e42809..68ab5bc 100644
--- a/i18n/de/libtodaydatebookplugin.ts
+++ b/i18n/de/libtodaydatebookplugin.ts
@@ -1,87 +1,146 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[mit Alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Notiz</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Ganzen Tag</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>Ort anzeigen</translation>
+        <translation type="obsolete">Ort anzeigen</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Auswählen, um den Ort des Termins anzuzeigen</translation>
+        <translation type="obsolete">Auswählen, um den Ort des Termins anzuzeigen</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Notizen anzeigen</translation>
+        <translation type="obsolete">Notizen anzeigen</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Auswählen, um die angehängte Notiz anzuzeigen</translation>
+        <translation type="obsolete">Auswählen, um die angehängte Notiz anzuzeigen</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>Nur spätere
+        <translation type="obsolete">Nur spätere
 Termine</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Auswählen, um nur spätere Termine anzuzeigen</translation>
+        <translation type="obsolete">Auswählen, um nur spätere Termine anzuzeigen</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>Wieviele Termine
+        <translation type="obsolete">Wieviele Termine
 sollen
 angezeigt werden ?</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
+        <translation type="obsolete">Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>Wieviele weitere Tage</translation>
+        <translation type="obsolete">Wieviele weitere Tage</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>Wieviele Tage imVoraus sollen angezeigt werden</translation>
+        <translation type="obsolete">Wieviele Tage imVoraus sollen angezeigt werden</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation>Tag(e)</translation>
+        <translation type="obsolete">Tag(e)</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">Nur heute</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Ort anzeigen</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Auswählen, um den Ort des Termins anzuzeigen</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Notizen anzeigen</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Auswählen, um die angehängte Notiz anzuzeigen</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Nur spätere Termine zeigen</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Auswählen, um nur spätere Termine anzuzeigen</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Zeit in extra Zeile</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>Wieviele Termine sollen gezeigt werden?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>Nur heute</translation>
     </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Wieviele Tage imVoraus sollen angezeigt werden</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Wieviele weitere Tage</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Terminplaner plugin</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Keine weiteren Termine heute</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Keine Termine heute</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodaymailplugin.ts b/i18n/de/libtodaymailplugin.ts
index 4a7fe15..d921edf 100644
--- a/i18n/de/libtodaymailplugin.ts
+++ b/i18n/de/libtodaymailplugin.ts
@@ -1,13 +1,14 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Mail plugin</source>
         <translation>Mail plugin</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; neue Mail(s), &lt;b&gt;%2&lt;/b&gt; im Postausgang</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libtodaytodolistplugin.ts b/i18n/de/libtodaytodolistplugin.ts
index d3387a2..f81ce36 100644
--- a/i18n/de/libtodaytodolistplugin.ts
+++ b/i18n/de/libtodaytodolistplugin.ts
@@ -1,40 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Todolist plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt; 1&lt;/b&gt; aktive Aufgabe: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Es gibt &lt;b&gt; %1&lt;/b&gt; aktive Aufgaben: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Keine aktiven Aufgaben</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Setzt die Zahl der maximal angezeigten Aufgaben</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>Aufgaben gezeigt</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Nach wie vielen Zeichen soll die Zeile abgeschnitten werden</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Zeile abschneiden nach X Zeichen</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>Angezeigte Aufgaben</translation>
+        <translation type="obsolete">Angezeigte Aufgaben</translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Setzt die Zahl der maximal angezeigten Aufgaben</translation>
+        <translation type="obsolete">Setzt die Zahl der maximal angezeigten Aufgaben</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Zeile abschneiden nach X Zeichen</translation>
+        <translation type="obsolete">Zeile abschneiden nach X Zeichen</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Nach wie vielen Zeichen soll die Zeile abgeschnitten werden</translation>
+        <translation type="obsolete">Nach wie vielen Zeichen soll die Zeile abgeschnitten werden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmpeg3plugin.ts b/i18n/de/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/de/libmpeg3plugin.ts
+++ b/i18n/de/libtremorplugin.ts
diff --git a/i18n/de/libwlan.ts b/i18n/de/libwlan.ts
new file mode 100644
index 0000000..36602bc
--- a/dev/null
+++ b/i18n/de/libwlan.ts
@@ -0,0 +1,141 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Wireless Configuration</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modus</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>&amp;Accesspoint</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>&amp;Channel</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>alles</translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation>Infrastruktur</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Schlüssel</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Schlüssel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Schlüssel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Schlüssel &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Schlüssel &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Unverschlüsselte Pakete</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Akzeptieren</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;ZTurückweisen</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Schnittstelleninformation</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modus</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Rate</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualität</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Störung</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libwlanplugin.ts b/i18n/de/libwlanplugin.ts
new file mode 100644
index 0000000..ea17ff7
--- a/dev/null
+++ b/i18n/de/libwlanplugin.ts
@@ -0,0 +1,137 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Wireless Konfiguration</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modus</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>&amp;AccessPoint</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>&amp;Channel</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>Jeder</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Verschlüsselung</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>Verschüsselung &amp;einsch.</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Schlüsel</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Schlüssel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Schlüssel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Schlüssel &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Schlüssel &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Unverschlüsselte Pakete</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Akpzeptieren</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Verweigern</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Interface Information</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Channel</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modus</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Rate</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualität</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Noise</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/liquid-settings.ts b/i18n/de/liquid-settings.ts
deleted file mode 100644
index e45a1eb..0000000
--- a/i18n/de/liquid-settings.ts
+++ b/dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation>Keine Transparenz</translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation>Stippled, Hintergrundfarbe</translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation>Stippled, Buttonfarbe</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation>Durchsichtig stippled, Hintergrundfarbe</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation>Durchsichtig stippled, Buttonfarbe</translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation>Nutzerdefinierte Transparenz</translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation>Menüfarbe</translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation>Textfarbe</translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation>Durchsichtigkeit</translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation>Schattierter Text</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/mailit.ts b/i18n/de/mailit.ts
index 788f406..c587833 100644
--- a/i18n/de/mailit.ts
+++ b/i18n/de/mailit.ts
@@ -1,556 +1,639 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>Angehängt</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>Dateiart</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>attach...</source>
         <translation>ahnhängen ...</translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>Anhang anfügen</translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>Account bearbeiten</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>Account erstellen</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>Accountname</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>Ihr Name</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>POP Benutzername</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>POP Passwort</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>POP Server</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>SMTP Server</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>Abgleichen</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>Mailgröße (kB)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>Untätig</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Accounts</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>Nachricht holen aus </translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>Account bearbeiten</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>Account löschen</translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation>Mail versenden</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>Erstellen</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Von</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Betreff</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>Eingang</translation>
     </message>
     <message>
         <source>To</source>
         <translation>An</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>Ausgang</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>Kein Accounbt ausgewählt</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>Sie müssen einen Account erstellen ...</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation>Hauptkontrolleiste</translation>
     </message>
     <message>
         <source>getMail</source>
         <translation>Mail holen</translation>
     </message>
     <message>
         <source>select account</source>
         <translation>Zugang wählen</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation>Klicken Sie um Mail von allen verfügbaren Servern zu holen.
 Halten Sie den Stift um einen Server auszuwählen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation>Kein Zugang verknüpft</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation>Es ist kein aktiver Zugang mit 
 dieser Mail verknüpft so dass sie
 nicht heruntergeladen werden kann</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Fehler beim Empfang</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>OK
+</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>Es konnten nicht alle Dateien
 der Mail gefunden werden mit dem Betreff: </translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>Die Mail wurde *nicht* gesendet</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>Attachmentfehler</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>Mail schreiben</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation>Mail prüfen</translation>
+        <translation type="obsolete">Mail prüfen</translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation>Zentrale Mailansicht</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation>Mail nicht heruntergeladen</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation>Die gewählte Nachricht wurde
 nocht nicht heruntergeladen.
 Möchten Sie dies jetzt durchführen ?</translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>Verbindung hergestellt</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>Fehler aufgetreten</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>Hole Mail</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>Nachricht vervollständigen</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>Keine neuen Nachrichten</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>Neue Nachrchten</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>Keine neuen Nachrichten</translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>DNS-Auflösung</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation>Die Betreffzeile sollte hier eingegeben werden</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation>Empfänger werden hier eingegeben</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation>Wenn Sie Kopien versenden möchten können Sie dies hier angeben</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation>Dieser Schalter öffnet das Adressbuch mit allen Mailadressen Ihres OPIE Addressbuchs</translation>
+        <translation type="obsolete">Dieser Schalter öffnet das Adressbuch mit allen Mailadressen Ihres OPIE Addressbuchs</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
         <translation>Geben Sie hier Ihren Text ein</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation>Hiermit stellen Sie Ihre Nachricht in die Warteschlange</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation>Dies ist eine Übersicht aller Nachrichtenanhänge</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation>Dies ist der Posteingang.
 Er enthält Ihre empfangenen Nachrichten
 die durch Doppelklicken gelesen werden 
 können. Ein blaues Symbol weist Sie auf Anhänge hin.</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation>Dies ist der Postausgang.
 Er enthält alle wartenden Nachrichten die
 durch Doppelklicken gelesen werden 
 können.</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation>Wählen Sie die Empfänger aus dieser Liste</translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
         <source>Previous</source>
         <translation>Vorherige</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Nächste</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>Attachments</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>Textformat</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Weiterleiten</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation>Klicken Sie hier um die Nachricht weiterzuleiten</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation>Lesen der vorhergehenden Nachricht der Liste</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation>Lesen dernächsten Nachricht der Liste</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation>Klicken Sie hier um Anhänge hinzuzufügen</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation>Diese Mailansicht hat 2 Modi:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; zeigt die Nachricht als HTMLmit sogenannten &quot;Rich Features&quot; an (ohne Zeilenumbrüche durch bspw. CRLF).
 &lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt;  zeigt die Nachricht als reinen Text an&lt;/LI&gt;
 Klicken Sie hier um zwischen beiden Modi umzusachalten</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation>Klicken Sie hier um die gewählte Nachricht zu löschen</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Herunterladen</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation>Klicken Sie hier um die Mail vom Server
 zu vervolständigen.</translation>
     </message>
     <message>
         <source>reply</source>
         <translation>antworten</translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation>auf die Nachricht antworten</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation>Klicken Sie hier um auf die Nachricht zu antworten.
 Halten Sie den Stift gedrückt für weitere Optionen.</translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation>An alle antworten</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation>Klicken Sie hier um allen Emfängern zu</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>DNS-Auflösung</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Verbindung hergestellt</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>Sende: </translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>Gesendet</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>Nachrichten</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>Installieren</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation>Klicken Sie hier um den Anhang zu Ihren Dokumenten z u installieren</translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Mail</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>Mail queuen</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>Neue Mail</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>An: </translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>Kopie: </translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>Betreff: </translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Anhang</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation>Klicken Sie hier um Dateien zu Ihrer Nachricht hinzuzufügen</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation>Dieser Schalter stellt Ihre Nachricht in die Warteschlange</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation>Klicken Sie hier um eine Nachricht zu erstellen</translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation>Kein Empfänger</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation>Nachricht senden an ?</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation>Ungültiges Empfängertrennzeichen</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Empfänger sollten durch ;
 getrennt werden und müssen gültige
 Adressen sein</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation>Ungültiges Trennzeichen der Kopieempfänger</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Kopieempfänger sollten durch ;
 getrennt werden und müssen gültige
 Adressen sein</translation>
     </message>
     <message>
         <source>Re: </source>
         <translation>Re:</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation>======weitergeleitete Nachricht von </translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation>beginnt======
 
 </translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation>FWD:</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation>======Ende der weitergeleiteten Nachricht======</translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation>schrieb am </translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>EMail</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/mediummount.ts b/i18n/de/mediummount.ts
index df10d66..cc691ba 100644
--- a/i18n/de/mediummount.ts
+++ b/i18n/de/mediummount.ts
@@ -1,96 +1,96 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation>Global</translation>
-    </message>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation>Mediummount-Einstellungen</translation>
     </message>
+    <message>
+        <source>Global</source>
+        <translation>Global</translation>
+    </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Sobald ein Medium in das Gerät eingelegt wird versucht OPIE, das Medium nach Dokumenten abzuscannen. Auf grossen Medien kann das durchaus einige Zeit in Anspruch nehmen. Sie können wählen, ob OPIE generell nach Dokumenten suchen soll oder abhängig vom eingelegten Medium. Jedes Medium kann zudem nachkonfiguriert werden.</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Suche nach neuen Medien aktivieren</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Globale Einstellungen benutzen</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Medientypen</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Sobald ein Medium in das Gerät eingelegt wird versucht OPIE, das Medium nach Dokumenten abzuscannen. Auf grossen Medien kann das durchaus einige Zeit in Anspruch nehmen. Sie können wählen, ob OPIE generell nach Dokumenten suchen soll oder abhängig vom eingelegten Medium. Jedes Medium kann zudem nachkonfiguriert werden.</translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Medienkonfiguration. Die Änderungen werden aktiv, wenn die Anwengung geschlossen wird. Um den Dokumentenordner zu aktualisieren, muss das Medium entfernt und wieder eingelegt werden.</translation>
+    </message>
     <message>
         <source>Which media files</source>
         <translation>Medientypen</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Suche begrenzen auf:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Dieses Medium immer überprüfen</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>Medienkonfiguration. Die Änderungen werden aktiv, wenn die Anwengung geschlossen wird. Um den Dokumentenordner zu aktualisieren, muss das Medium entfernt und wieder eingelegt werden.</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/de/mpegplayer.ts b/i18n/de/mpegplayer.ts
deleted file mode 100644
index a67dd30..0000000
--- a/i18n/de/mpegplayer.ts
+++ b/dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OPIEPlayer</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation>Keine Datei</translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation>Fehler: Keine Datei ausgewählt</translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation>Datei nicht gefunden</translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation>Die folgende Datei wurde nicht gefunden: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation>Kein Dekoder gefunden</translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation>Bedaure, kein entsprechender Dekoder für diese Datei gefunden: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation>Fehler beim Öffnen der Datei</translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation>Bedaure, ein Fehler trat beim Versuch auf, die Datei abzuspielen: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation>Datei: </translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, Länge:</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Abspielliste</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OPIEPlayer</translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation>Abspielaktionen</translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Zur Abspielliste hinzufügen</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Von der Liste entfernen</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Abspielen</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Zufällig</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Wiederholen</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Datei</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Liste löschen</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Alle Audiodateien hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Alle Videodateien hinzufügen</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Alle Dateien hinzufügen</translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation>Abspielliste speichern</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Anzeigen</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Vollbild</translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation>Skalieren</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Hoch</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Runter</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>Kein Speicher</translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation>Es gab ein Problem beim Speichern der Abspielliste.
-Ihrer Abspielliste fehlen eventuell einige Einträge
-wenn Sie sie das nächste Mal öffnen.</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Ungültige Datei</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Es gab ein Problem beim Laden des Files</translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation>Dies steht bereits in der Abspielliste.
-Fortfahren ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nein</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>Abspielliste entfernen ?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>Möchten Sie die Abspielliste
-wirklcih löschen ?</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Ausgewähltes abspielen</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>Medium</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>Listen</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>OPIEPlayer:</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Abspiellsite speichner</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Eigenschaften</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OPIEPlayer</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/netsetup.ts b/i18n/de/netsetup.ts
deleted file mode 100644
index 4a314da..0000000
--- a/i18n/de/netsetup.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Neue Netzwerksettings</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>Dies sind die verfügbaren Netzwerkdienste.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Neu</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Abbrechen</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>Es kann lediglich ein %1 zugefügt werden</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Netzwerk</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Netzwerk</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Aktuelles</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>Der Status der aktuellen Netzwerkservices</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Dienste</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Neu...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>Die aktuell verfügbaren Dienste.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Eigenschaften</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/networksettings.ts b/i18n/de/networksettings.ts
index c2eaaa9..ec49cbd 100644
--- a/i18n/de/networksettings.ts
+++ b/i18n/de/networksettings.ts
@@ -1,89 +1,131 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
-        <translation>Netzwerkverbindung hinzufügen</translation>
+        <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation>&amp;Hinzufügen</translation>
+        <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
-        <translation>Netzwerkeinstellungen</translation>
+        <translation>Netzwerkeinstellung</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Verbindungen</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation>in</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation>&amp;Hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation>&amp;Informationen</translation>
+        <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
-        <translation>&amp;Einstellungen</translation>
+        <translation>&amp;Konfigurieren</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation>E&amp;ntfernen</translation>
+        <translation>&amp;Entfernen</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Profile</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
-        <translation>&amp;Aktuelles setzen</translation>
+        <translation>Akt&amp;uelles setzen</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Aktuelles Profil</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Neues Profil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Eine Liste aller Netzwerkeinstellungen zum Auswählen</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Neue Schnittelstelle in die Liste.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Start/Stop</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Starten und Stoppen der aktuellen Schnittstelle, gibt auch Informationen über die Verbindung.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Aktuelle Schnittstelle konfigurieren</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Aktuelle Schnittstelle aus der Liste entfernen.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Löchen nicht möglich.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Bedaure </translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Bitte wählen Sie zuerst eine Schnittstelle.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/odict.ts b/i18n/de/odict.ts
index ade26b7..84e6e04 100644
--- a/i18n/de/odict.ts
+++ b/i18n/de/odict.ts
@@ -1,128 +1,111 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Suchmethode</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation>Allgemeine Einstellungen</translation>
+        <source>New</source>
+        <translation>Neu</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation>Suchmethoden</translation>
+        <source>Change</source>
+        <translation>Ändern</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
-        <source>OPIE-Dictionary</source>
-        <translation>Opie-Wörterbuch</translation>
+        <source>Opie-Dictionary</source>
+        <translation>OPIE-Wörterbuch</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Suche:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>Suchmethoden</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation>&amp;Groß/Kleinschreibung beachten</translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation>&amp;Nur ganze Wörter</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation>&amp;Reguläre Ausdrücke erlauben</translation>
+        <translation>&amp;Groß- und Kleinschreibung beachten</translation>
     </message>
     <message>
-        <source>0 Errors</source>
-        <translation>0 Fehler</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation>1 Fehler</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation>2 Fehler</translation>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation>3 Fehler</translation>
+        <source>Parameter</source>
+        <translation>Parameter</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation>4 Fehler</translation>
+        <source>No dictionary defined</source>
+        <translation>Kein Wörterbuch definiert</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation>Bis zum Treffer</translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definieren</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation>&amp;Fehlertoleranz</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Abbruch</translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation>Parameter</translation>
+        <source>OPIE-Dictionary</source>
+        <translation>OPIE-Lexikon</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation>Wörterbuchdatei</translation>
+        <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Sprache 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Trenner</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Sprache 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Neue Suchmethode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation>Ändere Suchmethode</translation>
+        <translation>Suchmethode ändern</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/oipkg.ts b/i18n/de/oipkg.ts
deleted file mode 100644
index 79e25ed..0000000
--- a/i18n/de/oipkg.ts
+++ b/dev/null
@@ -1,357 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation>Installiere</translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation>Ipkg Optionen</translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation>-force-depends</translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation>-force-reinstall</translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation>-force-removal-of-essential-packages</translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>Zu entfernen</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation>Zu installieren</translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation>-force-overwrite</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation>Paket Manager</translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation>Feeds</translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation>Paket</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ansicht</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Einstellugnen</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation>Hilfe</translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation>Anwenden</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Auffrischen</translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation>Einstellugnen</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Ziele</translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation>schliesse Sektion</translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation>Sektionen</translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation>Filter:</translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation>lösche Finden</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>schliesse Finden</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation>Filter</translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation>lösche Suchen</translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation>suche</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Suchen</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Ziel</translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation>Linke</translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation>schliesse Ziele</translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation>Paket Aktionen</translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation>Installiere </translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation>Paket Status</translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation>Neue Version, installiert</translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation>Neue Version, nicht installiert</translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation>Alte Version, installiert</translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation>Alte Version, nicht installiert</translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation>Alte Version, neue Version installiert</translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation>NeueVersion, alte Version installiert</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation>Dokumente</translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation>Netz Suche</translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation>Sektion:</translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation>Suchen:</translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation>Paket</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation>Neu</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation>Paket Server</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Einstellugnen</translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation>Installations Ziele:</translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation>Linke auf das root Ziel</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Neu</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entferne</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Name:</translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Ziele</translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation>Linke auf /</translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation>Entferne Links</translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation>flüchtig</translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation>entfernbar</translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation>Verwendetet Server: (Markierte Server sind aktiv)</translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation>
-Alles fertig.</translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation>Entferne</translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation>bitte warten</translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation>Fehler beim entfernen</translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>Installiere</translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation>Fehler beim Installieren</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation>Beschreibung:</translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation>Grösse:</translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation>anderes</translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation>Installations Name:</translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation>an</translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation>Name:</translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation>Linke:</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nein</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Ziel:</translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation>Status:</translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation>Installiere nach</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation>arbeite...</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/opie-console.ts b/i18n/de/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/de/opie-console.ts
+++ b/i18n/de/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opie-login.ts b/i18n/de/opie-login.ts
index 3754637..6937c12 100644
--- a/i18n/de/opie-login.ts
+++ b/i18n/de/opie-login.ts
@@ -1,89 +1,102 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Berühren Sie das Fadenkreuz kräftig
 und präzise um Ihr Display zu 
 kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Willkommen zu OPIE</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</translation>
+        <translation>&lt;center&gt;Willkommen in Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Ausschalten</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Falsches Passwort</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Das eingegebene Passwort ist nicht richtig.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>OPIE wurde durch
+        <translation type="obsolete">OPIE wurde durch
 ein nicht abgefangenes
 Signal beendet: %1
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>OPIE konnte nicht gestartet werden.</translation>
+        <translation type="obsolete">OPIE konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Konnte nicht zu einer anderen Identität wechseln</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>Opie wurde durch
+ein nicht abgefangenes
+Signal beendet: %1</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>Opie konnte nicht gestartet werden.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/opie-sheet.ts b/i18n/de/opie-sheet.ts
deleted file mode 100644
index 822b926..0000000
--- a/i18n/de/opie-sheet.ts
+++ b/dev/null
@@ -1,816 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation>&amp;Ränder</translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation>Hinter&amp;grund</translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation>&amp;Font</translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation>&amp;Ausrichtung</translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation>&amp;Breite: </translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation>&amp;Farbe: </translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation>&amp;Defaultränder</translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation>&amp;Stil: </translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation>&amp;Defaulthintergrund</translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation>&amp;Font: </translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation>&amp;Größe: </translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation>&amp;Fett</translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation>&amp;Italic</translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation>&amp;Defaultfont</translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation>&amp;Vertikal: </translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation>&amp;Horizontal: </translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation>&amp;Umbruch</translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation>&amp;Defaultausrichtung</translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation>Zellen formatieren</translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Opie Sheet</translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Suchen&amp;&amp;Ersetzen</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Optionen</translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation>&amp;Suchen nach_ </translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation>&amp;Ersetzen mit: </translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Typ: </translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Suchen: </translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation>&amp;Ersetzen: </translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation>&amp;Alle ersetzen</translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation>Groß-/&amp;Kleinschreibung egal</translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation>Nur Aktuelle Au&amp;swahl</translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation>&amp;Ganze Zelle</translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation>Suchen &amp; Ersetzen</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Opie Sheet</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation>Inkonsistenzfehler</translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation>Datei kann nicht gesichert werden !</translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation>Datei kann nicht geöffnet werden !</translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation>Ungültiges Dateiformat !</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Datei sichern</translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation>Möchten Sie die aktuelle Datei sichern ?</translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation>&amp;Dateiname: </translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation>Unbenannte Datei</translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation>Neue Datei</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation>Datei öffnen</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation>&amp;Öffnen</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Speichern</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation>Datei speichern als...</translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation>Speichern &amp;als</translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation>Verlassen</translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation>&amp;Verlassen</translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation>Allgemeine Hilfe</translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation>&amp;Allgemein</translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation>Über OPIE-Sheet</translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help file not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation>Syntaxfehler !</translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation>Suchtext nicht gefunden !</translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Sortieren</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Optionen</translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation>&amp;Sortieren nach</translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation>&amp;Dann nach</translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation>Dann &amp;nach</translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation>&amp;Groß-/Kleinschreibung beachten</translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation>&amp;Richtung</translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation>&amp;Oben nach unten (Reihen)</translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation>&amp;Rechts nach Links (Spalten)</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Sortieren</translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation>&amp;Aufsteigen</translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation>&amp;Absteigend</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation>Eine einzelne Zelle kann nicht sortiert werden !</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/opie-write.ts b/i18n/de/opie-write.ts
index b87d78d..be81c52 100644
--- a/i18n/de/opie-write.ts
+++ b/i18n/de/opie-write.ts
@@ -1,117 +1,116 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
-        <translation>Öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation>Rückgängig</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation>Wiederherstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation>Kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation>Ausschneiden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation>Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation>Fett</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italic</source>
-        <translation>Kursiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation>&amp;Kursiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Underline</source>
-        <translation>Unterstrichen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Underline</source>
-        <translation>&amp;Unterstrichen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Left</source>
-        <translation>Links</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Center</source>
-        <translation>Zentriert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right</source>
-        <translation>Rechts</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
-        <translation>Voll</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rich Text Editor</source>
-        <translation>Texteditor</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation>Unbenannt</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QTextEdit</name>
     <message>
         <source>&amp;Undo</source>
-        <translation>&amp;Rückgängig</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Redo</source>
-        <translation>&amp;Wiederherstellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation>Löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation>Alles auswählen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieftp.ts b/i18n/de/opieftp.ts
index 6e5d32d..3a9acf5 100644
--- a/i18n/de/opieftp.ts
+++ b/i18n/de/opieftp.ts
@@ -1,248 +1,244 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Verbindung</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Lokal</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Remote</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Berbinden</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Trennen</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Versteckte Dateien anz.</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Uploac</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Verz. erstellen</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Umbennen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Wechseln zu Lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Wechsel zu Remote</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Wechsel zu Konfig.</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Verzeichnis</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>PAsswort</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Remoteserver</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Remotepfad</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Bitte setzen Sie die Serverinfo</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Konnte nicht verbinden nach
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Anmelden nicht möglich
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Upload nicht möglich</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Verzeichnis-Upload nicht möglich</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Download nicht möglich</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Verzeichnis-Listing nicht möglich</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Verzeichniswechsel nicht möglich
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>cd nach oben nicht möglich</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Holen des Arbeitsverzeichnisses nicht möglich
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Verzeichniswechsel</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Möchten Sie wirklich löschen
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>? Es muss leer sein.</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Verzeichniserstelleung nicht möglich
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Verzeichnis löschen nicht möglich
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Datei löschen icht möglich</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Datei umbennen nicht möglich
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Konnte nicht umbennen </translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Dieses Verzeichnis existiert nicht</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Über</translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation>Neu scannen</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Neuer Servername</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Bedaure, der Name wird bereits verwendet.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index 33ef781..063f42b 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Spreche auf Kanal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC Klient</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
+        <translation>Serververbindungen, Kanäle, Gespräche und andere Sachen werden hier sein</translation>
     </message>
     <message>
         <source>IRC</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle eine neue Verbindung zu einem IRC-Server</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguriere OpieIRC&apos;s Verhalten und Aussehen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieplayer.ts b/i18n/de/opieplayer.ts
index 2c0875f..862024b 100644
--- a/i18n/de/opieplayer.ts
+++ b/i18n/de/opieplayer.ts
@@ -1,276 +1,264 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>Irgend etwas stimmt
 nicht mit Ihrem Sounddevice.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Der Player wird beendet.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OPIEPlayer</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Keine Datei</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Fehler: Keine Datei ausgewählt</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>Datei nicht gefunden</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>Die folgende Datei wurde nicht gefunden: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>Kein Dekoder gefunden</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Bedaure, kein entsprechender Dekoder für diese Datei gefunden: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Fehler beim Fileöffnen</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Bedaure, ein Fehler trat auf beim Versuch des Abspielens der Datei: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>Datei:</translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, Länge:</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Lautstärke</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Abspiellistenauswahl</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
-        <translation>OpiePlayer</translation>
+        <translation type="unfinished">OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
-        <translation>Wiedergabefunktionen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
-        <translation>Zur Stückliste zufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
-        <translation>Von Stückliste entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
-        <translation>Abspielen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
-        <translation>Zufällig</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
-        <translation>Schleife</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
-        <translation>Liste löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
-        <translation>Alle Audiodateien hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
-        <translation>Alle Videodateien hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
-        <translation>Alle Dateien hinzufügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
-        <translation>Stückliste speichern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
-        <translation>Datei oder URL öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
-        <translation>Audiodateien suchen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
-        <translation>Videodateien suchen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Ansicht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
-        <translation>Vollbild</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation>Hoch</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation>Runter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
-        <translation>Titel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
-        <translation>Größe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
-        <translation>Medium</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
-        <translation>Listen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
-        <translation>OpiePlayer:</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>Zu wenig Speicherplatz</translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation>Die Stückliste konnte nicht gespeichert werden.
-Einige Einträge können beim nächsten Start
-fehlen.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
-        <translation>Ungültige Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
-        <translation>Die Datei konnte nicht geöffnet werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
-        <translation>Stückliste entfernen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
-        <translation>Soll diese Stückliste wirklich gelöscht werden?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nein</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation>Eigenschaften</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
-        <translation>Ausgewählte abspielen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
-        <translation>Datei oder URL öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
-        <translation>Stückliste als m3u speichern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
-        <translation>Oberfläche</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
-        <translation>Pfad</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OPIEPlayer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieplayer2.ts b/i18n/de/opieplayer2.ts
deleted file mode 100644
index 730f475..0000000
--- a/i18n/de/opieplayer2.ts
+++ b/dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OPIEPlayer</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source> File: </source>
-        <translation>Datei:</translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, Länge:</translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation>Lautstärke</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation>OpiePlayer: Initialisierung</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>OpiePlayer: </translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Größe</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>Medium</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Pfad</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Abspiellistenauswahl</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Zur Stückliste hinzu</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Aus Stückliste entferne</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Abspielen</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Zufällig</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Loop</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Liste löschen</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Alle Audiodateien hinzu</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Alle Filme hinzu</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Alle Dateien hinzu</translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation>Datei oder URL öffnen</translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation>Nach Audiodateien suchen</translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation>Nach Filmen suchen</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Vollbild</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Rauf</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Runter</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>OpiePlayer: </translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Ungültige Datei</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Es gab ein Problem beim Holen der Datei.</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>Stückliste entfernen ?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>Möchten Sie die Stückliste wirklich löschen ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nein</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Abspielen</translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation>Datei oder URL öffnen</translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation>Stückliste speichern (m3u)</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Stückliste speichern</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation>Abspielaktionen</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Datei</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Anzeige</translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation>Skins</translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation>Gamma (Video)</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>Listen</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation>OpiePlayer - Video</translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation>Fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation>Kein Eingabeplugin für diesen Medientypen gefunden
-(Ist opieplayer-codecs installiert ?)</translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation>Keinen Decoder für dieen Medientyp gefunden.
-(Ist opieplayer-codecs installiert ?)</translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation>Demuxing für diesen Medientyp fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation>Ungültige MRL</translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation>Fehler aufgetreten</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/opierec.ts b/i18n/de/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/de/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/osearch.ts b/i18n/de/osearch.ts
new file mode 100644
index 0000000..a1cdef8
--- a/dev/null
+++ b/i18n/de/osearch.ts
@@ -0,0 +1,144 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>OPIE Suche</translation>
+    </message>
+    <message>
+        <source>adressbook</source>
+        <translation type="obsolete">Adressbuch</translation>
+    </message>
+    <message>
+        <source>todo</source>
+        <translation type="obsolete">Aufgaben</translation>
+    </message>
+    <message>
+        <source>datebook</source>
+        <translation type="obsolete">Terminplaner</translation>
+    </message>
+    <message>
+        <source>applications</source>
+        <translation type="obsolete">Programme</translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="obsolete">Dokumente</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>suchen</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Überall suchen</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Groß-/Kleinschreibung beachten</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Benutze Wildcards</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Die Details der aktuellen Suche</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Optionen</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Gebe den zu suchenden Begriff hier ein</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Anwendungen</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Dokumente</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Aufgaben</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Termine</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Adressbuch</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Resultate</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>Zeige</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>Bearbeiten</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>Ausführen</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>Im Dateimanager öffnen</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>Öffnen mit</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>Zeige auch erledigte Aufgaben</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>Zeige auch vergangene Termine</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>Suche in Zeitfeldern</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Datei:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Link:</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>Dateityp:</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>Suchinhalt</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>suche %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/oxygen.ts b/i18n/de/oxygen.ts
index b025d1d..e009ed0 100644
--- a/i18n/de/oxygen.ts
+++ b/i18n/de/oxygen.ts
@@ -1,566 +1,562 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Berechnungen</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Molekulargewicht</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Chemische Formel</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Molekulargewicht (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
-        <translation>elementare Zusammensetzung (%):</translation>
+        <translation>elementare Zusammensetzunh (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Gewicht:</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Block</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektronegativität</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Atomradius</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
-        <translation>Ionisationsenergie</translation>
+        <translation>Ionsationsenergie</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Dichte</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Siedepunkt</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Schmelzpunkt</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Daten</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Berechnungen</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Wasserstoff</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bor</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Kohlenstoff</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Stickstoff</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>Fluor</translation>
+        <translation>Flour</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminum</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>Silizium</translation>
+        <translation>Silikon</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phospor</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Schwefel</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlor</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Kalzium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titan</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrom</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>Mangan</translation>
+        <translation>Mangesium</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Eisen</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nickel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Kupfer</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsen</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selen</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brom</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>Zirkonium</translation>
+        <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niob</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybden</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Silber</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Zinn</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimon</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellur</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iod</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cäsium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthan</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cer</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation>Praseodym</translation>
+        <translation>Praseodymium</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation>Neodym</translation>
+        <translation>Neodymium</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation>Tantal</translation>
+        <translation>Tantalum</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolfram</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhenium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platin</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Gold</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Quecksilber</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Blei</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismut</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation>Astat</translation>
+        <translation>Astatine</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Thorium</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinium</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uran</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptunium</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonium</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americium</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curium</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkelium</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californium</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevium</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerium</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Periodensystem</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>Fehler:</translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Chemische Daten</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/patience.ts b/i18n/de/patience.ts
index 5872069..062a9ee 100644
--- a/i18n/de/patience.ts
+++ b/i18n/de/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spiel</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Kartenrücken wechseln</translation>
+        <translation type="obsolete">&amp;Kartenrücken wechseln</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Zur Position springen</translation>
+        <translation type="obsolete">&amp;Zur Position springen</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Spiel</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Kartenrücken wechseln</translation>
+        <translation type="obsolete">Kartenrücken wechseln</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Zur Position springen</translation>
+        <translation type="obsolete">Zur Position springen</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Eine Karte drehen</translation>
+        <translation type="obsolete">Eine Karte drehen</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
+        <translation type="obsolete">Drei Karten drehen</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Rückseiten ändern</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Zu Position springen</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Rückseiten ändern</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Zu Position springen</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Eine Karte drehen</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
         <translation>Drei Karten drehen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/qasteroids.ts b/i18n/de/qasteroids.ts
index fc1e221..5c78a97 100644
--- a/i18n/de/qasteroids.ts
+++ b/i18n/de/qasteroids.ts
@@ -1,42 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KAstTopLevel</name>
     <message>
         <source>Asteroids</source>
         <translation>Asteroids</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Spielstand</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Level</translation>
     </message>
     <message>
         <source>Ships</source>
         <translation>Schiffe</translation>
     </message>
     <message>
         <source>Fuel</source>
-        <translation>Treibstoff</translation>
+        <translation>Sprit</translation>
     </message>
     <message>
         <source>Press Calendar to start playing</source>
         <translation>Drücken Sie die Kalendertaste um zu starten</translation>
     </message>
     <message>
         <source>Ship Destroyed.
 Press Contacts/Home key.</source>
         <translation>Schiff zerstört.
 Drücken Sie die Addressbuch-/Home-Taste</translation>
     </message>
     <message>
         <source>Game Over.
 Press Calendar for a new game.</source>
         <translation>Game Over: 
-Drücken Sie die Kalendertaste für ein weiteres Spiel</translation>
+Drücken Sie die Kalendertste für ein weiteres Spiel</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/qpdf.ts b/i18n/de/qpdf.ts
index 5b4269a..2177cd3 100644
--- a/i18n/de/qpdf.ts
+++ b/i18n/de/qpdf.ts
@@ -1,102 +1,105 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Seitenbreite</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Ganze Seite</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Öffnen...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Vollbildmodus</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Erste Seite</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Vorherige Seite</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Gehe zu Seite...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Nächste Seite</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Letzte Seite</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Weitersuchen</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Gehe zu Seite</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Auswahl im Bereich 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
-        <translation>&apos;%1&apos; konnte nicht gefunden werden.</translation>
+        <translation>Kann &apos;%1&apos; nicht finden.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>Datei existiert nicht.</translation>
+        <translation type="obsolete">Datei existiert nicht !</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation>Datei existiert nicht!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 5827e82..fbba2d8 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -1,258 +1,258 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;%q antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Möchten Sie die Anwendung beenden?&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Berühren Sie mit dem Stift die Kreuze auf dem Schirm so, wie Sie normalerweise Ihr Gerät bedienen um den Schirm zu kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Willkommen bei OPIE</translation>
+        <translation>Willkommen bei Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Icon-Ansicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listenansicht</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Der Batteriestatus ist kritisch!
-Schließen Sie das Gerät schnellst-
+Schließen Sie das Gerät schnellst 
 möglich an die Stromversorgung an!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Der Batteristatus ist sehr niedrig.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>Die Ersatzbatterie ist schwach.
 Bitte laden Sie sie auf.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Visitenkarte</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Das Systemdatum scheint ungültig zu sein.
-(%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es korrigieren?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Batteriestatus</translation>
+        <translation>&lt;p&lt;Das Systemdatum scheint nicht gültig zu sein.
+(%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Für Dokumente des Typs %1 ist keine Anwendung definiert.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Suche Dokumente</translation>
+        <translation>Dokumente finden</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Suche Dokumente</translation>
+        <translation>Dokumente suchen</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 Dateien</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Alle Dateien dieses Typs</translation>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Neues Medium eingelegt</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Ein &lt;b&gt;neues Medium&lt;/b&gt; wurde eingelegt. 
-Soll es nach Dokumenten durchsucht werden?</translation>
+Soll es nach neuen Dokumenten durchsucht werden ?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Dokumentenauswahl</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Bilder</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Videos</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Anwendungen verlinken</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Suche auf folgendes Verzeichnis begrenzen: (unbenutzt)</translation>
+        <translation>Auf folgendes Verzeichnis begrenzen: (unbenutzt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Auswahl auf dem Medium speichern</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Bei diesem Medium nie mehr nachfragen</translation>
+        <translation>Dieses Medium nie mehr nachfragen</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Batteriestatus</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>OPIE beenden </translation>
+        <translation>Opie beenden </translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>OPIE neu starten</translation>
+        <translation>Opie neu starten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>Die Optionen zum Herunterfahren sind ausschließlich zur Entwicklung und für Tests des OPIE-Systems gedacht. Unter normalen Bedingungen sind sie nicht notwendig.</translation>
+        <translation>Die Optionen zum Herunterfahren sind ausschließlich zur Entwicklung und für Tests des Opie-Systems gedacht. Unter normalen Bedingungen sind sie nicht notwendig.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>Herunterfahren ...</translation>
+        <translation>Herunterfahren...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Snychronisationsverbindung</translation>
+        <translation>Synchronisationsverbindung</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;/p&gt;&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Verweigern</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Ein nicht erkanntes System fordert eine Verbindung zu diesem Gerät an.&lt;/p&gt;&lt;p&gt;Wenn Sie zum ersten Mal eine Synchronisation gestartet haben, ist diese Meldung normal.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Ein nicht erkanntes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie gerade eben zum ersten Mal eine Synchronisation gestartet haben, ist diese Meldung normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Erlauben</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Synchronisieren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adressen&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/reader.ts b/i18n/de/reader.ts
index 7bd97bb..0bf3ce2 100644
--- a/i18n/de/reader.ts
+++ b/i18n/de/reader.ts
@@ -1,309 +1,786 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
+    <message>
+        <source>Toolbar Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Datei</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Markierung</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indikatoren</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Scroll Geschwindigkeit</translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished">Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished">Anmerken</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">Vollbild</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Zurück</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Vorwärts</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Home</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
+    <message>
+        <source>Tidy-up</source>
+        <translation>Aufräumen</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Lösche Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Delete Configuration</source>
+        <translation>Lösche Konfiguration</translation>
+    </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Schliessen</translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <source>On Action...</source>
-        <translation>Bei Aktion...</translation>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Suchen</translation>
     </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
     <message>
-        <source>Open File</source>
-        <translation>Datei öffnen</translation>
+        <source>Annotation</source>
+        <translation>Anmerkung</translation>
     </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
     <message>
-        <source>Autoscroll</source>
-        <translation>Autoscroll</translation>
+        <source>International</source>
+        <translation>International</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation>Markieren</translation>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fullscreen</source>
-        <translation>Vollbild</translation>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation>Navigation</translation>
+        <source>Apply font
+to dialogs</source>
+        <translation>Schrift auf Dialoge anwenden</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation>Scrollen</translation>
+        <source>Encoding</source>
+        <translation>Encoding</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation>Springe</translation>
+        <source>Application</source>
+        <translation>Programm</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation>Seiten/Zeilen Scroll</translation>
+        <source>Message</source>
+        <translation>Mitteilung</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation>Überhang setzen</translation>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation>Cursor benutzen</translation>
+        <source>Dictionary</source>
+        <translation type="unfinished">Wörterbuch</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation>Wörterbuch setzen</translation>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
     <message>
-        <source>Two/One Touch</source>
-        <translation>Doppel-/Einfachklick</translation>
+        <source>Strip CR</source>
+        <translation type="unfinished">CR entfernen</translation>
+    </message>
+    <message>
+        <source>Dehyphen</source>
+        <translation type="unfinished">ohne Bindestr. </translation>
+    </message>
+    <message>
+        <source>Single Space</source>
+        <translation type="unfinished">Einzelleerzeichen</translation>
+    </message>
+    <message>
+        <source>Unindent</source>
+        <translation type="unfinished">Nicht eingerückt</translation>
+    </message>
+    <message>
+        <source>Reparagraph</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Double Space</source>
+        <translation>Doppelleerzeichen</translation>
+    </message>
+    <message>
+        <source>Remap</source>
+        <translation>Umbelegen</translation>
+    </message>
+    <message>
+        <source>Embolden</source>
+        <translation>Fett stellen</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation>Ziel</translation>
+        <source>Full Justify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished">Kodierung</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Schrift</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anmerken</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Gehe zu</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Automatisch gen.</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Löschen</translation>
     </message>
     <message>
+        <source>Save</source>
+        <translation>Sichern</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>ordentlich</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Block kopieren</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Oben</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Unten</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>minimiert</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>bewegbar</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
         <source>Annotation</source>
         <translation>Anmerkung</translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Clipboard</source>
         <translation>Zwischenablage</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation>Hoch</translation>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation>Runter</translation>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation>Suchen...</translation>
+        <source>Continuous</source>
+        <translation>Pausenlos</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation>Fortlaufend</translation>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation>Kodierung</translation>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
     <message>
-        <source>Auto</source>
-        <translation>Automatisch</translation>
+        <source>Scroll</source>
+        <translation>Scrollen</translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nichts</translation>
+        <source>Back</source>
+        <translation>Zurück</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Text</translation>
+        <source>Home</source>
+        <translation>Home</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation>HTML</translation>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
-        <translation>Peanut/PML</translation>
+        <source>Page Up</source>
+        <translation>Seite nach oben</translation>
     </message>
     <message>
-        <source>Layout</source>
-        <translation>Layout</translation>
+        <source>Page Down</source>
+        <translation>Seite nach unten</translation>
     </message>
     <message>
-        <source>Strip CR</source>
-        <translation>CR entfernen</translation>
+        <source>Goto Start</source>
+        <translation>Zum Anfang gehen</translation>
     </message>
     <message>
-        <source>Dehyphen</source>
-        <translation>ohne Bindestriche</translation>
+        <source>Goto End</source>
+        <translation>Zum Ende gehen</translation>
     </message>
     <message>
-        <source>Single Space</source>
-        <translation>Einzelne Leerzeichen</translation>
+        <source>Jump</source>
+        <translation>Springe</translation>
     </message>
     <message>
-        <source>Unindent</source>
-        <translation>Nicht eingerückt</translation>
+        <source>Page/Line Scroll</source>
+        <translation>Seiten/Zeilen Scroll</translation>
     </message>
+</context>
+<context>
+    <name>CPrefs</name>
     <message>
-        <source>Re-paragraph</source>
-        <translation>Umformatieren</translation>
+        <source>OpieReader Settings</source>
+        <translation>OpieReader Einstellungen</translation>
     </message>
     <message>
-        <source>Double Space</source>
-        <translation>Doppelte Leerzeichen</translation>
+        <source>Layout</source>
+        <translation type="unfinished">Layout</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation>Einrücken</translation>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation>Ausrücken</translation>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation>Repalm</translation>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation>Umbelegen</translation>
+        <source>Buttons</source>
+        <translation>Knöpfe</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
-        <translation>Fett stellen</translation>
+        <source>Clipboard</source>
+        <translation>Zwischenablage</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Vergrößern</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Verkleinern</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation>Ideogramm/Wort</translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation>Breite setzen</translation>
+        <source>Set Font</source>
+        <translation>Schrift setzen</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Encoding</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation>ASCII</translation>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>UTF-8</source>
-        <translation>UTF-8</translation>
+        <source>Open</source>
+        <translation>Öffnen</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Vollbild</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Scrollen</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Springe</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Seiten/Zeilen Scroll</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation>UCS-2(BE)</translation>
+        <source>Two/One Touch</source>
+        <translation>Doppel/Singel Touch</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation>USC-2(LE)</translation>
+        <source>Annotation</source>
+        <translation>Anmerkung</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation>Palm</translation>
+        <source>Up</source>
+        <translation>Hoch</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation>Windows(1252)</translation>
+        <source>Down</source>
+        <translation>Runter</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Suchen...</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Vergrößern</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Verkleinern</translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation>Font setzen</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anmerken</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Gehe zu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>Automatisch gen.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sichern</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation>ordentlich</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Blockanfang</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Block kopieren</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation>Format</translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation>Markierung</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Nächtes suchen</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Suche schließen</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation>Reg. erstellen</translation>
     </message>
     <message>
         <source>Close Edit</source>
-        <translation>Edit schliessen</translation>
+        <translation>Edit schließen</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Konfiguration</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Speichere die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Lade die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Lösche die Einstellungen</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Führe Script aus</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exportiere Verweise</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Gehe zum Anfang</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Gehe zum Ende</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Zurück</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Vorwärts</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Setze Ziel</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Setze Encoding</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation>Datei suchen</translation>
+        <translation>Dateien suchen</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Versteckt</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/remote.ts b/i18n/de/remote.ts
index dc9c435..d6c410b 100644
--- a/i18n/de/remote.ts
+++ b/i18n/de/remote.ts
@@ -1,22 +1,22 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainView</name>
     <message>
         <source>Remote</source>
         <translation>Fernbedienung</translation>
     </message>
     <message>
         <source>Learn</source>
         <translation>Lernen</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>Einstellungen</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 2a0b1f7..6de956a 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -1,108 +1,121 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Passwort festlegen</translation>
+        <translation>Passwort einstellen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Passwort falsch</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Neues Passwort eingeben</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Passwort erneut eingeben</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sicherheitseinstellungen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Passwort löschen</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation>Passwort beim Starten eingeben</translation>
+        <translation>Passwort muss beim Starten 
+eingegeben werden</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
 sollte jemand unerwünscht Zugriff auf dieses 
 Gerät erhalten.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/sheetqt.ts b/i18n/de/sheetqt.ts
index a4d8a6f..6a05307 100644
--- a/i18n/de/sheetqt.ts
+++ b/i18n/de/sheetqt.ts
@@ -1,798 +1,787 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
-        <translation>&amp;Rahmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
-        <translation>&amp;Hintergrund</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Font</source>
-        <translation>&amp;Schrift</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
-        <translation>&amp;Ausrichtung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation>S&amp;tärke:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation>&amp;Farbe:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
-        <translation>S&amp;tandard</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation>St&amp;il:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
-        <translation>S&amp;tandard</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation>&amp;Schrift:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation>&amp;Größe:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Bold</source>
-        <translation>&amp;Fett</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation>&amp;Kursiv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
-        <translation>S&amp;tandard</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation>&amp;Vertikal:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation>H&amp;orizontal:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
-        <translation>&amp;Zeilenumbruch</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
-        <translation>S&amp;tandard</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format Cells</source>
-        <translation>Zellenformat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Sheet</source>
-        <translation>Tabellenkalkulation</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Suchen &amp;&amp; Ersetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation>&amp;Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation>S&amp;uche nach:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation>&amp;Ersetzen durch:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation>&amp;Modus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation>Su&amp;chen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Replace</source>
-        <translation>E&amp;rsetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
-        <translation>&amp;Alle ersetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Match &amp;case</source>
-        <translation>&amp;Groß-/Kleinschreibung beachten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
-        <translation>&amp;Nur in der Auswahl suchen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
-        <translation>G&amp;anze Zelle</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
-        <translation>Suchen und Ersetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
-        <translation>Tabellenkalkulation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
-        <translation>Konsistenzfehler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
-        <translation>Datei konnte nicht gespeichert werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
-        <translation>Datei konnte nicht geöffnet werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid file format!</source>
-        <translation>Ungültiges Dateiformat.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save File</source>
-        <translation>Datei speichern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
-        <translation>Soll die Datei gespeichert werden?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation>&amp;Dateiname:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>UnnamedFile</source>
-        <translation>Unbenannt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New File</source>
-        <translation>Neue Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation>&amp;Neu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation>Datei öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation>&amp;Öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Speichern</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save File As</source>
-        <translation>Datei speichern unter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation>Speichern &amp;unter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation>Übernehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Übernehmen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>A&amp;bbrechen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cell Selector</source>
-        <translation>Zellenauswahl</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
-        <translation>&amp;Zellenauswahl</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut Cells</source>
-        <translation>Zellen ausschneiden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation>&amp;Ausschneiden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Cells</source>
-        <translation>Zellen kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation>&amp;Kopieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Cells</source>
-        <translation>Zellen Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Contents</source>
-        <translation>Inhalt einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
-        <translation>&amp;Inhalt einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Cells</source>
-        <translation>Zellen löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;lear</source>
-        <translation>&amp;Löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Cells</source>
-        <translation>Zellen einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ells</source>
-        <translation>&amp;Zellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Rows</source>
-        <translation>Zeilen einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rows</source>
-        <translation>Z&amp;eilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Columns</source>
-        <translation>Spalten einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Columns</source>
-        <translation>&amp;Spalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Sheets</source>
-        <translation>Blätter einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
-        <translation>&amp;Blätter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cells</source>
-        <translation>Zellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cells</source>
-        <translation>&amp;Zellen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row Height</source>
-        <translation>Zeilenhöhe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>H&amp;eight</source>
-        <translation>&amp;Höhe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adjust Row</source>
-        <translation>Zeile anpassen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
-        <translation>&amp;Anpassen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Row</source>
-        <translation>Zeile anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation>A&amp;nzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Row</source>
-        <translation>Zeile verstecken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation>&amp;Verstecken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column Width</source>
-        <translation>Spaltenbreite</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width</source>
-        <translation>&amp;Breite</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adjust Column</source>
-        <translation>Spalte anpassen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Column</source>
-        <translation>Spalte zeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide Column</source>
-        <translation>Spalte verstecken</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename Sheet</source>
-        <translation>Blatt umbenennen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Rename</source>
-        <translation>&amp;Umbenennen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Sheet</source>
-        <translation>Blatt entfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;emove</source>
-        <translation>E&amp;ntfernen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort Data</source>
-        <translation>Daten sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation>&amp;Sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
-        <translation>Suchen &amp;&amp; Ersetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>Suchen &amp;&amp; &amp;Ersetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equal To</source>
-        <translation>ist gleich</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
-        <translation>&amp;Ist gleich</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addition</source>
-        <translation>Addition</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Addition</source>
-        <translation>&amp;Addition</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation>Subtraktion</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation>&amp;Subtraktion</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multiplication</source>
-        <translation>Multiplikation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
-        <translation>&amp;Multiplikation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Division</source>
-        <translation>Division</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Division</source>
-        <translation>&amp;Division</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation>Klammer öffnen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
-        <translation>&amp;Klammer auf</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
-        <translation>Klammer schließen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
-        <translation>K&amp;lammer zu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma</source>
-        <translation>Komma</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Comma</source>
-        <translation>K&amp;omma</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation>&amp;Datei</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation>&amp;Bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Insert</source>
-        <translation>&amp;Einfügen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Format</source>
-        <translation>&amp;Format</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Data</source>
-        <translation>D&amp;aten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Row</source>
-        <translation>Z&amp;eile</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
-        <translation>&amp;Spalte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
-        <translation>&amp;Blatt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Function</source>
-        <translation>&amp;Funktion</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation>&amp;Standard</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation>Summe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation>&amp;Summe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation>Absolutwert</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation>&amp;Betrag</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation>Sinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation>S&amp;inus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation>Arkussinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation>&amp;Arkussinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation>Kosinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation>&amp;Kosinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation>Arkuskosinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation>A&amp;rkuskosinus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation>Tangens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation>&amp;Tangens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation>Arkustangens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation>Ark&amp;ustangens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation>Arkustangens von Koordinaten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation>K&amp;oord. Arkustangens</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation>e^x</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation>&amp;e^x</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation>Logarithmus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation>&amp;LOG</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Power</source>
-        <translation>x^y</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation>&amp;x^y</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation>&amp;Mathematisch</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Average</source>
-        <translation>Durchschnitt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation>&amp;Durchschnitt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation>Maximum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation>&amp;Maximum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation>Minimum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation>M&amp;inimum</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Count</source>
-        <translation>Anzahl</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation>&amp;Anzahl</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation>S&amp;tatistisch</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Functions</source>
-        <translation>Funktionen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
-        <translation>Über Opie Sheet</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation>Opie Sheet
-Tabellenkalkulation für Opie
-QWDC Beta Sieger (als Sheet/Qt)
-
-Entwickelt von: Serdar Ozler
-Version 1.0.2
-Datum: 8.10.2002
-
-Dieses Programm ist unter der GPL lizensiert. Es kann frei vertrieben werden. Wenn Sie die aktuellste Version und/oder den Quellcode haben möchten, besuchen Sie bitte die Webseite.
-
-http://qtopia.sitebest.com</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation>&amp;Anzahl der Zeilen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation>&amp;Anzahl der Spalten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation>&amp;Anzahl der Blätter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sheet</source>
-        <translation>Blatt</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation>&amp;Höhe jeder Zeile:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation>&amp;Breite jeder Spalte:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation>&amp;Blattname:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
-        <translation>Es existiert nur ein Blatt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation>Sind sie sicher?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation>&amp;Modus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
-        <translation>Zellen nach &amp;unten verschieben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
-        <translation>Zellen nach &amp;rechts verschieben</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
-        <translation>Ganze &amp;Zeile</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
-        <translation>Ganze &amp;Spalte</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation>Syntaxfehler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search key not found!</source>
-        <translation>Suchbegriff nicht gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
-        <translation>&amp;Sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation>&amp;Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
-        <translation>&amp;Sortieren nach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Then by</source>
-        <translation>&amp;Dann nach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Then &amp;by</source>
-        <translation>Dann &amp;nach</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
-        <translation>&amp;Groß-/Kleinschreibung beachten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation>&amp;Richtung</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
-        <translation>Von &amp;oben nach unten (zeilenweise)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
-        <translation>Von &amp;links nach rechts (spaltenweise)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort</source>
-        <translation>Sortieren</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
-        <translation>&amp;Aufsteigend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Descending</source>
-        <translation>A&amp;bsteigend</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation>Eine einzelne Zelle kann nicht sortiert werden.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/showimg.ts b/i18n/de/showimg.ts
index b2aff3f..f578d7f 100644
--- a/i18n/de/showimg.ts
+++ b/i18n/de/showimg.ts
@@ -1,159 +1,159 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Helligkeit</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Bildbetrachter</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
-        <translation>Horizontal spiegeln</translation>
+        <translation>Horizontal drehen</translation>
     </message>
     <message>
         <source>Vertical flip</source>
-        <translation>Vertikal spiegeln</translation>
+        <translation>Vertical drehen</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>180° drehen</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>90° Drehen</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Vollbild</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Bildbetrachter</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Echtfarben</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vorschau</translation>
     </message>
     <message>
         <source>Preferences..</source>
-        <translation>Einstellungen...</translation>
+        <translation>Einstellungen..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Bildinformationen...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Öffnen...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>270° Drehen</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Helligkeit...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Schwarzweiß</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
-        <translation>An Bildschirmgröße anpassen</translation>
+        <translation>Auf Bildschirmgröße vergrößern</translation>
     </message>
     <message>
         <source>File</source>
-        <translation>Datei</translation>
+        <translation>Daten</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 Farben</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 Alphakanäle</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
-        <translation>8-bit Alpha Kanal</translation>
+        <translation>8-bit alpha Kanal</translation>
     </message>
     <message>
         <source>Slide show</source>
-        <translation>Diashow</translation>
+        <translation>Slideshow</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
-        <translation>Diashow anhalten</translation>
+        <translation>Slideshow anhalten</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Slide Show</source>
-        <translation>Diashow</translation>
+        <translation>Slideshow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
-        <translation>Verzögerung zwischen den Bildern</translation>
+        <translation>Verzögerung zwischen Bildern</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
-        <translation>Diashow wiederholen</translation>
+        <translation>Slideshow wiederholen</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Bilder rückwärts zeigen</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Bilder 90 Grad rotiert laden</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
-        <translation>Bilder im Voraus laden</translation>
+        <translation>Bilder voraus laden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/snake.ts b/i18n/de/snake.ts
index 4287eaf..133e087 100644
--- a/i18n/de/snake.ts
+++ b/i18n/de/snake.ts
@@ -1,45 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Schlange</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Neues Spiel</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>SCHLANGE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Benutzen Sie die Wippe, um die
 Schlage zu steuern und die Mäuse
 zu fressen. Sie dürfen dabei weder die
 Wände noch Ihren Schwanz berühren.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Drücken Sie eine Taste, um zu starten</translation>
+        <translation type="obsolete">Drücken Sie eine Taste, um zu starten</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>Punkte: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>Erwischt! 
 Ihre Punktezahl: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Drücken Sie eine Taste, um ein neues
+        <translation type="obsolete">Drücken Sie eine Taste, um ein neues
 Spiel zu beginnen.</translation>
     </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Drücken Sie zum Starten eine Taste</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Für eine neues Spiel drücken Sie eine Taste.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/stockticker.ts b/i18n/de/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/de/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index 7d96558..dc0f769 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -1,314 +1,295 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Dieser Graph zeigt an wieviel Speicher auf dieser CompactFlash-Karte verwendet wird.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Dieser Graph zeigt den auf dieser Festplatte verwendeten Speicher an.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Dieser Graph zeigt den auf dieser Secure Digital Memory Card verwendeten Speicher an.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Dieser Graph zeigt an, wie viel des eingebauten Speichers zur Zeit belegt wird.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Dieser Graph zeigt den von der RAM Disk verwendeten Speicher an.</translation>
+    </message>
+</context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>CPU-Auslastung durch Anwendungen (%)</translation>
+        <translation>CPU-Auslastung für Anwendungen (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>CPU-Auslastung durch System (%)</translation>
+        <translation>Systemauslastung (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt die Auslastung des Prozessors.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Gepufferter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gecached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Freier Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamter Speicher: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Diese Seite zeigt wieviel Speicher (z.B. RAM) auf dem Gerät momentan belegt ist.
-Der Speicher wird wie folgt unterteilt:
-1. Belegt - Speicher, der von OPIE und laufenden Anwendungen benutzt wird.
-2. Puffer - Temporärer Speicher um die Geschwindigkeit zu steigern
-3. Gecached - Informationen die, seit kurzem nicht mehr benutzt werden, aber noch nicht freigegeben wurden.
-4. Frei - Speicher, der nicht durch OPIE oder Anwendungen belegt ist.</translation>
+Speicher wird wie folgt unterteilt:
+1. Belegt - Speicher, der von Opie und laufenden Anwendungen belegt wird.
+2. Puffer - Temporärer Speicher um die Performanz zu steigern
+3. Gecached - Information die seit kurzem nicht mehr benutzt wird, aber noch nicht freigegeben wurde.
+4. Frei - Speicher, der nicht durch Opie oder Anwendungen belegt wird. </translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Use#</source>
-        <translation>Benutzt #</translation>
+        <translation>Benutzung#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Benutzt durch</translation>
+        <translation type="obsolete">Benutzt von</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ein Modul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
+        <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ei nModul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wählen Sie einen Befehl und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt; um den Befehl auszuführen.
-&lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wissen, was Sie tun.</translation>
+&lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
-        <translation>Klicken Sie hier, um den Befehl an das Modul zu senden.
-&lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wissen, was Sie tun.</translation>
+        <translation>Klicken Sie hier, um den Befehl an das Module zu senden.
+&lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen der Module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>Möchten Sie den Befehl wirklich ausführen
-</translation>
+        <translation type="obsolete">Möchten Sie den Befehl wirklich ausführen </translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Verfügbar (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation>Dies ist eine Liste aller aktuell laufenden Prozesse.
-Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt zu bekommen oder um ein Signal an den Prozess zu senden.</translation>
+        <translation>Dies ist eine Liste aller Prozesse dieses Gerätes.
+Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt zu bekommen oder um ein Signal dorthin zu senden.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation>Wählen Sie ein Signal aus und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt;, um das Signal an den Prozess zu senden.
-&lt;b&gt;Achtung:&lt;/b&gt; Das Senden von Signalen sollte nur dann durchgeführt werden, wenn Sie wissen was Sie tun.</translation>
+        <translation>Wählen Sie ein Signal aus und drücken Sie rechts &lt;b&gt;Senden&lt;/b&gt; um das Signal an den Prozess zu senden.
+&lt;b&gt;Achtung:&lt;/b&gt;Das Senden von Signalen sollte nur dann durchgeführt werden, wenn Sie wissen was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klicken Sie hier, um das Signal an den Prozess zu senden.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen über den gewählten Prozess an.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>Wollen Sie das Signal wirklich senden 
-</translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>CF-Karte:</translation>
+        <translation type="obsolete">Wollen Sie das Signal wirklich senden </translation>
     </message>
     <message>
-        <source>Hard Disk </source>
-        <translation>Festplatte</translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>SD-Karte</translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>Festplatte /dev/hd</translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>SCSI-Festplatte /dev/sd</translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>Interner Speicher</translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>Dieser Graph zeigt an wieviel Speicher auf dieser Speicherkarte verwendet wird.</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>Dieser Graph zeigt den auf der Festplatte verwendeten Speicher an.</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>Dieser Graph zeigt den auf der Secure Digital Memory Card verwendeten Speicher an.</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>In</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>Dieser Graph zeigt an, wieviel des eingebauten Speichers zur Zeit verwendet wird.</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>RAM disk</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>Dieser Graph zeigt den von der RAM Disk verwendeten Speicher an.</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeminformationen</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Storage</source>
-        <translation>Speichermedien</translation>
+        <translation>Speichermedium</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Prozesse</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Module</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiliert von:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation>&lt;b&gt;OPIE&lt;/b&gt;&lt;p&gt;Version: </translation>
+        <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
-        <translation>Erstellt am:</translation>
+        <translation>Geschrieben am:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;Modell: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;Hersteller:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation>Diese Seite zeigt Informationen über die verwendete Version von OPIE, den Linux Kernel und die auf diesem Gerät verwendete Distribution.</translation>
+        <translation>Diese Seite zeigt die aktuelle Version von Opie, des Linux Kernels und der auf diesem Gerät verwendeten Distribution.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/systemtime.ts b/i18n/de/systemtime.ts
index 8726e82..8ae5bef 100644
--- a/i18n/de/systemtime.ts
+++ b/i18n/de/systemtime.ts
@@ -1,521 +1,244 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Zeitformat</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation>T/M hh:mm</translation>
+        <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation>M/T hh:mm</translation>
+        <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24 Stunden</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 Stunden</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 Stunden</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Datumsformat</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Woche startet am</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Systemzeit</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation>Vorhersage</translation>
+        <translation>Vorschlagen</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Sie haben eine Verzögerung von</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation>Minuten eingestellt, aber nur</translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>Minuten sind seit dem letzten Abgleich vergangen.&lt;br&gt;Trotzdem Forfahren?</translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Sie haben eine Verzögerung von %1 Minuten eingestellt, aber nur %2 Minuten sind seit dem letzten Synchronisieren verstrichen.&lt;br&gt;Weitermachen?</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation>Fortfahren?</translation>
+        <translation>Weitermachen?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation>Führe aus:
+        <translation>Starte:
 ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation>Fehler bei der Zeitermittlung über das Netzwerk.</translation>
+        <translation>Fehler beim Holen der Zeit vom Netzwerk.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation>Fehler beim Ausführen von ntpdate</translation>
+        <translation>Fehler biem Aufruf von ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Zeitserver</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation>Fehler beim Ermitteln der Zeit von
-dem Server: </translation>
+        <translation>Fehler beim Holen der Zeit
+vom Server: </translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation>Sekunden</translation>
+        <source>%1 seconds</source>
+        <translation>%1 Sekunden</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation>Keine Verbindung zum Server </translation>
+        <translation>Keine Verbindung zum Server</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation>n/a</translation>
+        <translation>n.V.</translation>
     </message>
     <message>
         <source>Time shift</source>
-        <translation>Abweichung</translation>
+        <translation>Zeitverschiebung</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Neue Zeit</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation>Zeit über das Netzwerk ermitteln</translation>
-    </message>
-</context>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">Starte NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">fe aus:</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Fehler beim Ausführen</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete"> Sekunden</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">Letzte [Std]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">Abweichung</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">Differenz [s/h]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete"> s/h</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Zeit vom Netzwerk holen</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Vorschlag:</translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">Keine Verbindung zu Server </translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Vorschlag</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Main</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">NTP Fehler</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">Fehler, Zeitabgleich vom Netzwerk nicht möglich !</translation>
-    </message>
-    <message>
-        <source>Error while getting time from server </source>
-        <translation type="obsolete">Fehler beim Abgleich mit dem Zeitserver</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Sie haben eine Differenz von %1 Minuten eingestellt, es sind aber lediglich %2 seit dem letzten Abgleich vergangen. Zeit dennoch abgleichen ?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Netzwerk Zeit</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Mit Netz abgleichen</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Startzeit:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">nan</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Zeitverschiebung:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Neue Zeit:</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Erwartete Versch.:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Zeitvoraussage:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Mittl. Versch.</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Vorschlag setzen</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Zeitvorschlag</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Verwende</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">als</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">NTP Server für Zeitabgleich.</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Warte auf </translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">Minuten bis</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">NTP-Abgleich mit dem Netzserver</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">Mindestdifferenz </translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">NTP-Abgleich wird als Vorschlag verwendet.</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Zeit setzen</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Haupt</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manuell</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Vorschlag</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Erweitert</translation>
+        <translation>Zeit vom Netzwerk holen</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation>Erwartete Abweichung</translation>
+        <translation>Vorhergesagte Abweichung</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation>n/a</translation>
+        <translation>n.V.</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation>Geschätzte Abweichung</translation>
+        <translation>Erwartete Abw.</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Vorhergesagte Zeit</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation>Verschiebung [s/h]</translation>
+        <translation>Verschiebung  [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation>Letzte [h]</translation>
+        <translation>Letzte [Std.]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation>Offset [s]</translation>
+        <translation>Offset [sek]</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation>Vorhersage</translation>
+        <translation>Vorraussage</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Vorhersage setzen</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation>s/h</translation>
+        <translation>Sek./Std.</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>Sekunden</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zeitzone</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Zeitformat</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 Stunden</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 Stunden</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Woche startet am</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Sontag</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Montag</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Datumsformat</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Appletformat</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">ss:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">Sonntag</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/T ss:mm</translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">System Zeit</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Stunde</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minute</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Zeitserver</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation>Minuten zwischen Aktualisierungen</translation>
+        <translation>Minuten zw. Aktualisierung</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation>Minuten zwischen Aktualisierung der Vorhersage</translation>
+        <translation>Minuten zw. Vorhersageaktualisierung</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation>Zeitserverinformationen anzeigen</translation>
+        <translation>Zeitserverinformation anzg.</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation>Vorhersagedetails anzeigen</translation>
+        <translation>Zeitvoraussageninform. anzeigen</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Stunde</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation>Zeit über das Netzwerk ermitteln</translation>
+        <translation>Zeit v. Netzwerk holen</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation>Vorhersage setzen</translation>
+        <translation>Vorausgesagte Zeit setzen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tableviewer.ts b/i18n/de/tableviewer.ts
index 586bd3d..7d41b6f 100644
--- a/i18n/de/tableviewer.ts
+++ b/i18n/de/tableviewer.ts
@@ -1,70 +1,69 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation>KeyList::addKey() Standardwert für den Typ %1 kann nicht gesetzt werden. Schlüssel nicht hinzugefügt.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation>DataElem::setField(%1, %2) Kein gültiger Typ gefunden</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
-        <translation>Zurücksetzen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>key</source>
-        <translation>Schlüssel</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
-        <translation>Tabellenbetrachter - Schlüssel bearbeiten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key Name</source>
-        <translation>Schlüsselname</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key Type</source>
-        <translation>Schlüsseltyp</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear All</source>
-        <translation>Alle löschen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
-        <translation>Liste anzeigen</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
-        <translation>Tabellenbetrachter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not load Document</source>
-        <translation>Das Dokument konnte nicht geladen werden</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tabmanager.ts b/i18n/de/tabmanager.ts
index 066da85..494616b 100644
--- a/i18n/de/tabmanager.ts
+++ b/i18n/de/tabmanager.ts
@@ -1,89 +1,87 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppEdit</name>
     <message>
         <source>Application</source>
         <translation>Programm</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Icon:</source>
         <translation>Icon:</translation>
     </message>
     <message>
         <source>Exec:</source>
-        <translation>Ausführen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Kommentar:</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabManager</name>
     <message>
         <source>Message</source>
-        <translation>Nachricht</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t remove with applications
 still in the group.</source>
-        <translation>Die Gruppe kann nicht entfernt werden,
-solange sie Programme enthält.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete?</source>
-        <translation>Wirklich löschen?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Abbrechen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can&apos;t remove.</source>
-        <translation>Löschen nicht erfolgreich.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation>Tab</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche Icons...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
-        <translation>Programm</translation>
+        <translation type="unfinished">Programm</translation>
     </message>
 </context>
 <context>
     <name>TabManagerBase</name>
     <message>
         <source>Tab Manager</source>
-        <translation>Tab Manager</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hierarchy</source>
-        <translation>Hierarchie</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten Sie...</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tetrix.ts b/i18n/de/tetrix.ts
index 2b90780..280ffda 100644
--- a/i18n/de/tetrix.ts
+++ b/i18n/de/tetrix.ts
@@ -1,29 +1,64 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>leer</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Welcher Name?</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Highscores</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Punkte</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ebene</translation>
+    </message>
+</context>
 <context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Nächster</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Punkte</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Ebene</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Entfernt</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/textedit.ts b/i18n/de/textedit.ts
index 46fc322..866d7a1 100644
--- a/i18n/de/textedit.ts
+++ b/i18n/de/textedit.ts
@@ -1,268 +1,277 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Ausschneiden</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Suchen...</translation>
     </message>
     <message>
         <source>Zoom in</source>
-        <translation>Vergrößern</translation>
+        <translation>Zoom in</translation>
     </message>
     <message>
         <source>Zoom out</source>
-        <translation>Verkleinern</translation>
+        <translation>Zoom aus</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Mit neuer Datei beginnen</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Bearbeiten</translation>
+        <translation>Editieren</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
         <source>Find Next</source>
-        <translation>Weitersuchen</translation>
+        <translation>Nächsten suchen</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation>Suche schließen</translation>
+        <translation>&quot;Suchen&quot; schließen</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop-Datei</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Verknüpfung</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Text</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Zeit und Datum einfügen</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Erweiterte Einstellungen</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Nachfragen beim Verlassen</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Immer die verknüpfte Datei öffnen</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Dateirechte</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Suchleiste öffnen</translation>
     </message>
     <message>
         <source>Goto Line...</source>
-        <translation>Gehe zu Zeile...</translation>
+        <translation>Gehe zu Linie...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
-        <translation>Automatisch sichern</translation>
+        <translation>Autospeichern 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Texteditor hat ein &lt;BR&gt;&lt;B&gt;Desktopfile&lt;/B&gt;&lt;BR&gt;erkannt.
-&lt;B&gt;.desktop-Datei&lt;/B&gt; oder &lt;B&gt;verlinkte&lt;/B&gt; Datei öffnen?</translation>
+&lt;B&gt;.desktop-Datei&lt;/B&gt; oder &lt;B&gt;verlinkte&lt;/B&gt; Datei öffnen ?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Speichern fehlgeschlagen</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Unbenannt</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Dateirechte</translation>
     </message>
     <message>
         <source>Choose font</source>
-        <translation>Schrift wählen</translation>
+        <translation>Font wählen</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Möchten Sie die aktuelle Datei wirklich &lt;b&gt;löschen&lt;/b&gt;?
-Dies kann nicht mehr rückgängig gemacht werden.&lt;BR&gt;</translation>
+        <translation type="obsolete">Möchten Sie wirklich die aktuelle Datei &lt;b&gt;löschen&lt;/b&gt; ?
+&lt;BR&gt;Dies kann nicht mehr rückgängig gemacht werden &lt;BR&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation>Text Edit ist urheberrechtlich geschützt von&lt;BR&gt;2000 Trolltech AS, und&lt;BR&gt;2002 von &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;und unterliegt der GPL.</translation>
+        <translation>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation>Texteditor</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
-        <translation>Es existieren ungespeicherte Änderungen.
-Speichern und weitermachen?</translation>
+        <translation>Texteditor hat ungespeicherte
+Änderungen festgestellt.
+Speichern und weitermachen ?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Nicht speichern</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>Not enough lines</source>
-        <translation>Nicht genug Zeilen</translation>
+        <translation>Nciht genug Zeilen</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Texteditor</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Dateirechte setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Setze Dateirechte für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
-        <translation>Andere</translation>
+        <translation>andere</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Besitzer</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lesen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>schreiben</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ausführen</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Warnung</translation>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation>Fehler - kein Besitzer</translation>
+        <translation>Fehler- kein Nutzer</translation>
     </message>
     <message>
         <source>Error- no  group</source>
-        <translation>Fehler - keine Gruppe</translation>
+        <translation>Fehler- keine Gruppe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Fehler beim Setzen des Benutzers oder der Gruppe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Fehler beim Setzen des Modus</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Dateirechte</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tictac.ts b/i18n/de/tictac.ts
index 9c1cc88..2c6e430 100644
--- a/i18n/de/tictac.ts
+++ b/i18n/de/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>TicTac</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computer fängt an</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Spieler fängt an</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Los!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Auf &apos;Los!&apos; klicken, um zu starten</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Ziehen Sie</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Der Computer hat gewonnen!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Unentschieden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tinykate.ts b/i18n/de/tinykate.ts
new file mode 100644
index 0000000..b841c95
--- a/dev/null
+++ b/i18n/de/tinykate.ts
@@ -0,0 +1,62 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKATE</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>neu</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Öffnen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Speichern als</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Datei</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Schriftgröße +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>SchriftSchriftgröße -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ansicht</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Werkzeuge</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Hervorhebungen</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Unbenannt %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 3dc7244..789360f 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,122 +1,193 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Dieses Gerät gehört </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Bitte füllen Sie Ihre Visitenkarte aus</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Keine Plugins gefunden</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Keine Plugins aktiviert</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Hier klicken, um das entsprechende 
 Programm zu starten</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Besitzer: %1&lt;/b&gt;</translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Heute von Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klicken Sie hier, um den Konfigurations-
 dialog zu starten</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Heute - Einstellungen</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Reihenfolge des Plugin-Ladens:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktiv/Reihenfolge</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Beim Starten
+        <translation type="obsolete">Beim Starten
 automatisch laden?
 (nur für Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>Minuten inaktiv</translation>
+        <translation type="obsolete">Minuten inaktiv</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Soll Heute bei starten automatisch gestartet werden.</translation>
+        <translation type="obsolete">Soll Heute bei starten automatisch gestartet werden.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Der Autostart wird erst aktivt, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war.</translation>
+        <translation type="obsolete">Der Autostart wird erst aktiv, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war.</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Symbolgröße</translation>
+        <translation type="obsolete">Symbolgröße</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Symbolgröße in Pixeln einstellen</translation>
+        <translation type="obsolete">Symbolgröße in Pixeln einstellen</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Neu laden</translation>
+        <translation type="obsolete">Neu laden</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
+        <translation type="obsolete">Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>Sekunden</translation>
+        <translation type="obsolete">Sekunden</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>niemals</translation>
+        <translation type="obsolete">niemals</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Wählen Sie eine Checkbox um ein Plugin zu aktivieren und deaktivieren oder verwenden Sie die Pfeile rechts um die Reihenfolge der Anzeige festzulegen</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Today konfigurieren</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Kleiner Banner</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>aktualisieren</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Soll Heute bei starten automatisch gestartet werden.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>autostart bei resume?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>
+Kleiner Banner</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Soll der Banner kleiner angezeigt werden</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Der Autostart wird erst aktiv, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>Minuten inaktiv</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>pixel</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Symbolgröße in Pixeln einstellen</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>niemals</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index a53319f..f79e832 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -1,596 +1,619 @@
 <!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation>Alarm um</translation>
+        <translation type="obsolete">&lt;h1&gt;Alarm um %0&gt;&lt;/h1&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Alarm um %1&gt;&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarme</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Wiederholung</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Aufgabe erstellen</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Aufgabe editieren</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>leise</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>laut</translation>
     </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>Neu von Vorlage</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Neue Aufgabe</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>Hier klicken, um eine neue Aufgabe zu erzeugen.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Aufgabe editieren</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>Hier klicken, um die aktuelle Aufgabe zu ändern.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Aufgabe sehen</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Löschen...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>Hier klicken, um die aktuelle Aufgabe zu löschen.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Alles Löschen...</translation>
+        <translation>Alles löschen...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>Löschen komplett</translation>
+        <translation>Erledigte Aufgaben löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>Hier klicken, um die aktuelle Aufgabe an ein anderes Gerät zu senden.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Anzeigen der erledigten Aufgabe</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation>Nur Anzeige überfäliger Aufgaben</translation>
+        <translation>Nur Anzeige überfälliger Aufgaben</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Fälligkeitsdatum anzeigen</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Schnelleingabe anzeigen</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datei</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>Schnelleingabe</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Dies ist eine Liste aller Aufgaben.
 
 Die Liste zeigt folgende Informationen:
 1. Erledigt- Ein grüner Haken zeigt die Erledigung der Aufgabe. Klicken Sie hier, um die Aufgabe zu erledigen.
 2. Priorität- Eine graphische Repräsentation der Aufgabenpriorität. Hier Doppelklicken, um sie zu ändern.
 3. Beschreibung- Die Aufgabenbeschreibung. Hier Klicken, um die Aufgabe auszuwählen.
 4. Fälligkeit- Zeigt wann die Aufgabe fällig ist. Diese Anzeige kann wahlweise ein- und ausgeschaltet werden, indem man im Menü Optionen-&gt;&quot;Fälligkeitsdatum anzeigen&quot; wählt.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Alle Kategorien</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Kein Speichplatz mehr</translation>
+        <translation>Kein Speicherplatz mehr</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Es war nicht möglich, 
 Ihre Änderungen zu 
 speichern. Bitte schaffen 
 Sie freien Speicherplatz. 
-Trozdem beenden?</translation>
+Trotzdem beenden?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Die Daten können nicht editiert werden.
+        <translation type="obsolete">Die Daten können nicht editiert werden.
 Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>alle Aufgaben?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>alle erledigten Aufgaben?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>nicht eingeteilt</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;%1 neue Aufgaben sind angekommen.&lt;p&gt;Wollen Sie diese zu ihren Aufgaben hinzufügen?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Neue Aufgaben</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>E.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorität</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>fällig bis</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Vorlagen konfigurieren</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Priorität der neuen Aufgabe zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier die Beschreibung der neuen Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Weiteres</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier zusätzliche Informationen für Ihre Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um eine neue Aufgabe hinzuzufügen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Aufgabeninformationen zurück zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Vorlageneditor</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Neu von Vorlage</translation>
     </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabellenansicht</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Tag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Art</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Geben Sie hier eine detaillierte Beschreibung der Aufgabe ein.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Erledige</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Arbeite an </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Kaufe</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiziere</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Hole</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Aktualisiere</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Erstelle</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Plane</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Anruf</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Maile</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Wählen Sie hier die Priorität der Aufgabe.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Wählen Sie die Kategorie der Aufgabe</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Wiederkehrende Aufgabe</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Klicken Sie hier, wenn die Aufgaben auf einer wiederkehrenden Basis anstehen. Bei Auswahl kann die Häufigkeit des Wiederkehrens über den &lt;b&gt;Wiederholung&lt;/b&gt;-Reiter gesetzt werden.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notizen:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Geben Sie hier zusätzliche Informationen zu der Aufgabe an.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Aufgabenliste</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Zusammenfassung:</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="obsolete">Notizen:</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klicken Sie hier, um den aktuellen Status des Tasks zu setzen.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Begonnen</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Verschoben</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Beendet</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nicht begonnen</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Wählen Sie hier den aktuellen Fortschritt der Aufgabe aus.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Startdatum</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Klicken Sie hier, um das Startdatum der aktuellen Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fälligkeitsdatum:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Klicken Sie hier, um das aktuelle Fälligkeitsdatum der Aufgabe zu setzen.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Erledigt:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Klicken Sie hier, um diese Aufgabe als erledigt zu markieren</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Klicken Sie hier. um das Datum der Erledigung zu setzen.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Ausführungsmodus</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Klicken Sie hier, um die Rolle des Ausführenden zu definieren.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nichts</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Verantwortlich</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Erledigt von</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation>Koordiert durch</translation>
+        <translation>Koordiniert durch</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Ausführender:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Dies ist der Name des Ausführenden</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Klicken Sie  hier, um den Ausführenden der Aufgabe festzulegen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/ubrowser.ts b/i18n/de/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/de/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/usermanager.ts b/i18n/de/usermanager.ts
index 7d8ee2e..56aa2db 100644
--- a/i18n/de/usermanager.ts
+++ b/i18n/de/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Gruppe editieren</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>OPIE-Benutzerverwaltung</translation>
+        <translation type="obsolete">OPIE-Benutzerverwaltung</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Opie-Benutzerverwaltung</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Benutzer hinzufügen</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Benutzer editieren</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/wordgame.ts b/i18n/de/wordgame.ts
index b5ce460..ccb44d3 100644
--- a/i18n/de/wordgame.ts
+++ b/i18n/de/wordgame.ts
@@ -1,133 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Board</name>
     <message>
         <source>Blanks: </source>
-        <translation>Leerzeichen:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Unknown word</source>
         <translation>Unbekanntes Wort</translation>
     </message>
     <message>
         <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
         <translation>&lt;p&gt;Das Wort &quot;%1&quot; ist nicht in der Datenbank.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
 </context>
 <context>
     <name>NewGameBase</name>
     <message>
         <source>Players</source>
         <translation>Spieler</translation>
     </message>
     <message>
         <source>AI3: Smart AI player</source>
-        <translation>KI3: Kluger KI-Spieler</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regeln</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Start</translation>
     </message>
 </context>
 <context>
     <name>RulesBase</name>
     <message>
         <source>Game Rules</source>
         <translation>Spielregeln</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
     <message>
         <source>Board</source>
         <translation>Brett</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Größe:</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation>Bearbeiten...</translation>
+        <translation>Editieren...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
 </context>
 <context>
     <name>ScoreInfo</name>
     <message>
         <source>&lt;P&gt;Invalid move</source>
         <translation>&lt;p&gt;Ungültiger Zug</translation>
     </message>
     <message>
         <source>&lt;P&gt;Score: </source>
         <translation>&lt;p&gt;Punkte:</translation>
     </message>
 </context>
 <context>
     <name>WordGame</name>
     <message>
         <source>Word Game</source>
-        <translation>Wortspiel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Back</source>
-        <translation>Zurück</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Fertig</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Schließen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End game</source>
-        <translation>Spiel beenden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to end the game early?</source>
-        <translation>Möchten Sie das Spiel vorzeitig beenden?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/.directory b/i18n/en/.directory
index 8011c58..1422555 100644
--- a/i18n/en/.directory
+++ b/i18n/en/.directory
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Name=English
 Name[da]=Engelsk
 Name[de]=Englisch
 Name[es]=Inglés
 Name[hu]=Angol
 Name[it]=Inglese
 Name[ja]=英語
 Name[no]=Engelsk
 Name[pt]=Inglês
 Name[pt_BR]=Inglês
 Name[sl]=Angleščina
+Name[nl]=Engels
\ No newline at end of file
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index bf6a179..8b6d8e6 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1,913 +1,912 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index ee084a6..ed7af0f 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -1,304 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</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>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
+It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/appskey.ts b/i18n/en/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/en/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/aqpkg.ts b/i18n/en/aqpkg.ts
index 348cc10..6db6ebe 100644
--- a/i18n/en/aqpkg.ts
+++ b/i18n/en/aqpkg.ts
@@ -1,546 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/backgammon.ts b/i18n/en/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/en/backgammon.ts
+++ b/i18n/en/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/backup.ts b/i18n/en/backup.ts
index 02b6cc2..e90fc17 100644
--- a/i18n/en/backup.ts
+++ b/i18n/en/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/bounce.ts b/i18n/en/bounce.ts
index 9d2d3d1..4a3035b 100644
--- a/i18n/en/bounce.ts
+++ b/i18n/en/bounce.ts
@@ -1,100 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/calibrate.ts b/i18n/en/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/en/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index 77b4422..b726534 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/clock.ts b/i18n/en/clock.ts
index d4a93dc..46ed171 100644
--- a/i18n/en/clock.ts
+++ b/i18n/en/clock.ts
@@ -1,93 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 1b02a97..45d7547 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -1,804 +1,796 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</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>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event.</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>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</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>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/drawpad.ts b/i18n/en/drawpad.ts
index 0e3ea96..86e7861 100644
--- a/i18n/en/drawpad.ts
+++ b/i18n/en/drawpad.ts
@@ -1,435 +1,443 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/euroconv.ts b/i18n/en/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/en/euroconv.ts
+++ b/i18n/en/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/filebrowser.ts b/i18n/en/filebrowser.ts
deleted file mode 100644
index aff9a16..0000000
--- a/i18n/en/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/formatter.ts b/i18n/en/formatter.ts
index 751e732..b1fd5b4 100644
--- a/i18n/en/formatter.ts
+++ b/i18n/en/formatter.ts
@@ -1,161 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
+        <source>Card mount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card mount failed!</source>
+        <source>You can now close the output window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
+        <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You can now close the output window.</source>
+        <source>Total: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal</source>
+        <source>Used: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage Type : </source>
+        <source>Available: %1 kB ( %d mB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
+        <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available: %1 kB ( %d mB)</source>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/helpbrowser.ts b/i18n/en/helpbrowser.ts
index 4951556..81e4b05 100644
--- a/i18n/en/helpbrowser.ts
+++ b/i18n/en/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
+        <source>Go</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/kpacman.ts b/i18n/en/kpacman.ts
index fb73268..7546bd0 100644
--- a/i18n/en/kpacman.ts
+++ b/i18n/en/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/launchersettings.ts b/i18n/en/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/en/launchersettings.ts
+++ b/i18n/en/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/librestartapplet.ts b/i18n/en/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/de/librestartapplet.ts
+++ b/i18n/en/lib.ts
diff --git a/i18n/en/libbatteryapplet-ipaq.ts b/i18n/en/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/en/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/libclockapplet.ts b/i18n/en/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/en/libclockapplet.ts
+++ b/i18n/en/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/en/libdialup.ts b/i18n/en/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/en/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/libflatstyle.ts b/i18n/en/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/en/libflatstyle.ts
+++ b/i18n/en/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libinterfaces.ts b/i18n/en/libinterfaces.ts
index 407ea1f..8239ed9 100644
--- a/i18n/en/libinterfaces.ts
+++ b/i18n/en/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libkeyview.ts b/i18n/en/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/en/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/libkppp.ts b/i18n/en/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/en/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/liblan.ts b/i18n/en/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/en/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/de/sfcave-sdl.ts b/i18n/en/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/de/sfcave-sdl.ts
+++ b/i18n/en/libmodplugin.ts
diff --git a/i18n/en/libnetmonapplet.ts b/i18n/en/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/en/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index b78f90c..24385f3 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -1,108 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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="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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on </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>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libopieobex.ts b/i18n/en/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/en/libopieobex.ts
+++ b/i18n/en/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 0a73dd7..9929ffe 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -1,886 +1,939 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</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>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodayaddressbookplugin.ts b/i18n/en/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/en/libtodayaddressbookplugin.ts
+++ b/i18n/en/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodaydatebookplugin.ts b/i18n/en/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/en/libtodaydatebookplugin.ts
+++ b/i18n/en/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodaytodolistplugin.ts b/i18n/en/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/en/libtodaytodolistplugin.ts
+++ b/i18n/en/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/en/libfreetypefactory.ts b/i18n/en/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/en/libfreetypefactory.ts
+++ b/i18n/en/libtremorplugin.ts
diff --git a/i18n/en/libwlan.ts b/i18n/en/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/en/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libwlanplugin.ts b/i18n/en/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/en/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/liquid-settings.ts b/i18n/en/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/en/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/mailit.ts b/i18n/en/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/en/mailit.ts
+++ b/i18n/en/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/mediummount.ts b/i18n/en/mediummount.ts
index 896ec3d..8f647e3 100644
--- a/i18n/en/mediummount.ts
+++ b/i18n/en/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/en/mobilemsg.ts b/i18n/en/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/en/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/mpegplayer.ts b/i18n/en/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/en/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/netsetup.ts b/i18n/en/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/en/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/networksettings.ts b/i18n/en/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/en/networksettings.ts
+++ b/i18n/en/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/odict.ts b/i18n/en/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/en/odict.ts
+++ b/i18n/en/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/oipkg.ts b/i18n/en/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/en/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/opie-console.ts b/i18n/en/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/en/opie-console.ts
+++ b/i18n/en/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opie-login.ts b/i18n/en/opie-login.ts
index 42551e6..f4806d5 100644
--- a/i18n/en/opie-login.ts
+++ b/i18n/en/opie-login.ts
@@ -1,83 +1,83 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
+        <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opie-sheet.ts b/i18n/en/opie-sheet.ts
deleted file mode 100644
index 322b113..0000000
--- a/i18n/en/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/opieirc.ts b/i18n/en/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/en/opieirc.ts
+++ b/i18n/en/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opiemail.ts b/i18n/en/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/en/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/opieplayer.ts b/i18n/en/opieplayer.ts
index b8f82ba..b142db6 100644
--- a/i18n/en/opieplayer.ts
+++ b/i18n/en/opieplayer.ts
@@ -1,268 +1,258 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/opieplayer2.ts b/i18n/en/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/en/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/opierec.ts b/i18n/en/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/en/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/osearch.ts b/i18n/en/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/en/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/patience.ts b/i18n/en/patience.ts
index 028b87e..473c0f2 100644
--- a/i18n/en/patience.ts
+++ b/i18n/en/patience.ts
@@ -1,73 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
+        <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Snap To Position</source>
+        <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Play</source>
+        <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
+        <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Snap To Position</source>
+        <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn One Card</source>
+        <source>&amp;Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>&amp;Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
+        <source>Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chicane</source>
+        <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Harp</source>
+        <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Teeclub</source>
+        <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/qpdf.ts b/i18n/en/qpdf.ts
index 2f03c32..828cbdf 100644
--- a/i18n/en/qpdf.ts
+++ b/i18n/en/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>50%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>75%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>125%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>150%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist !</source>
+        <source>File does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index f692d4a..10ba42e 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/reader.ts b/i18n/en/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/en/reader.ts
+++ b/i18n/en/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/rotation.ts b/i18n/en/rotation.ts
deleted file mode 100644
index 8f282b7..0000000
--- a/i18n/en/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index e7b76f9..57461fe 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,105 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/snake.ts b/i18n/en/snake.ts
index d9d6107..1a1e3e6 100644
--- a/i18n/en/snake.ts
+++ b/i18n/en/snake.ts
@@ -1,40 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/spreadsheet.ts b/i18n/en/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/en/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/stockticker.ts b/i18n/en/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/en/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/sysinfo.ts b/i18n/en/sysinfo.ts
index c7d5112..9836d29 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -1,302 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <source>You really want to send %1 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/systemtime.ts b/i18n/en/systemtime.ts
index c68c7e9..aa9898a 100644
--- a/i18n/en/systemtime.ts
+++ b/i18n/en/systemtime.ts
@@ -1,250 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/tetrix.ts b/i18n/en/tetrix.ts
index 4916eef..4f7b960 100644
--- a/i18n/en/tetrix.ts
+++ b/i18n/en/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/textedit.ts b/i18n/en/textedit.ts
index 86ab013..f6a71b7 100644
--- a/i18n/en/textedit.ts
+++ b/i18n/en/textedit.ts
@@ -1,264 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</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>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/tictac.ts b/i18n/en/tictac.ts
index 1e4a751..f8eccb8 100644
--- a/i18n/en/tictac.ts
+++ b/i18n/en/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/tinykate.ts b/i18n/en/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/en/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 6efe1a8..74c5ec8 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,117 +1,138 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>minutes inactive</source>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon size</source>
+        <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the icon size in pixel</source>
+        <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How often should Today refresh itself</source>
+        <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/todaydatebookpluginconfig.ts b/i18n/en/todaydatebookpluginconfig.ts
deleted file mode 100644
index e392d58..0000000
--- a/i18n/en/todaydatebookpluginconfig.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index e4fcec0..7f42c48 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,555 +1,581 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information about this task here.</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo List</source>
+        <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/en/ubrowser.ts b/i18n/en/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/en/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/usermanager.ts b/i18n/en/usermanager.ts
index 282a43f..28f3895 100644
--- a/i18n/en/usermanager.ts
+++ b/i18n/en/usermanager.ts
@@ -1,31 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
+        <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/wellenreiter.ts b/i18n/en/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/en/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/en/wlansetup.ts b/i18n/en/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/en/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/.directory b/i18n/es/.directory
index d93b296..84db6e9 100644
--- a/i18n/es/.directory
+++ b/i18n/es/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Spanish
 Name[da]=Spansk
 Name[es]=Español
 Name[it]=Spagnolo
 Name[pt]=Espanhol
 Name[pt_PT]=Espanhol
 Name[sl]=Španščina
+Name[de]=Spanisch
+Name[nl]=Spaans
\ No newline at end of file
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 6046f8b..4271ed1 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -1,917 +1,916 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nombre Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elige</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escribir correo a</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Emitir entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mis datos personales</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar mis datos personales</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Dirección</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis Datos Personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar busqueda</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Guardar datos</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Tarjetas</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>No Encontrado</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Tarjeta</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar búsqueda</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>¿Tipo fichero correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>¡Incapaz de encontrar un contacto
 con ese patrón de búsqueda!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>El fichero seleccionado
 no termina en &quot;.vcf&quot;.
 ¿Seguro que quiere abrirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>¿Añadir contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>¿Seguro que quiere añadir el contacto para 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sí a &amp;todo</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>¡Tiene que seleccionar un contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>¡Tiene que elegir un nombre de fichero!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Estilo consulta</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usar expresiones regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usar comodines (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Prefiere QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Prefiere Opie-Mail</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Configuración de Búsqueda</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Aviso: QT-Mail sólo se
 suministra en la Rom de
 SHARP. ¡Opie-Mail se
 suministra gratis!</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Orden</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleccionar orden de contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Pulse tab para seleccionar uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Configuración del estilo de búsqueda</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>El botón de búsqueda espera una expresión regular al selecionarse</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>El botón de búsqueda espera sólo comodines simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si lo selecciona, la búsqueda diferencia entre mayúsculas y minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Tamaño de letra para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Configuración de letras para la vista en lista y tarjetas</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Use la aplicación de correo de Sharp si está disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Use el correo de OPIE si está instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sube los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Baja los atributos seleccionados una línea</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lista de todos los atributos disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Añade el atributo seleccionado de la lista inferior a la lista superior</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Borra el atributo seleccionado de la lista superior</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Orden (arriba-&gt;abajo) que define el contacto principal que se muestra el la segunda columna en la vista en lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Herramienta-/Barra de menú</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Arreglado</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>¡Cambie entre menu fijo-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Movible</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>¡Cambie a menú-/barra de herramientas después de reiniciar la aplicación!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ciudad</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincia</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nombre...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organización</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Gran Bretaña</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japón</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemania</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introducir Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nombre</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Argelia</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Antillas</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Acerballán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belice</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudas</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhután</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Isla Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darusalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Camboya</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Islas Caimán</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Isla de Navidad</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comodo</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Isla Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Costa d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croacia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Checoslovaquia</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>República Dominicama</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Ecuatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopía</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Isla Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Islas Feroes</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guayana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabón</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guayana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>El Vaticano</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungría</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macao</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malasia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malvinas</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 9a05c97..3a70159 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -1,318 +1,378 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Ejecutar comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Ejecutar comando con salida</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Pasar a remoto</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envío IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ejecutar</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crear enlace simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info fichero</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Fijar permisos</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Emitir fichero</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar </translation>
     </message>
     <message>
         <source> As</source>
         <translation> Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>No pude copiar
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>a
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>No puede mover
 </translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>¿Confirma el borrado
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Confirme borrado
-</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>¿Confirma la copia
 de los ficheros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 existe. ¿Lo sobrescribo?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> ya existe.
 ¿Seguro que quiere borrarlo?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 existe. ¿Lo sobreescribo?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>No pude copiar %1 a %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 copyright 2002-2003 por
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 y está bajo licencia GPL
 </translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation>No puedo borrar el directorio
-actual de los favoritos.
-¡No está entre los favoritos!</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Directorio de favoritos</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Borrar el directorio actual de los favoritos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>No pude borrar el directorio actual
+de los favoritos.
+¡No está marcado como favorito!</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Buscar archivo</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>¿Seguro que quiere borrar %1
+y todo su contenido?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>¿Confirma el borrado
+de %1?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">Gestor de Ficheros Avanzado :: </translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete"> kB libres</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">Copiar &quot;%1&quot; como</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>El proceso no pudo empezar</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Error
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Finalizado
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lectura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escritura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecución</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Aviso</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Error - sin usuario</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Error - sin grupo</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Error fijando propietario o grupo</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Error fijando modo</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/appskey.ts b/i18n/es/appskey.ts
deleted file mode 100644
index 93d95bf..0000000
--- a/i18n/es/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Teclas de Aplicación</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Contactos</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Inicio</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Menú emergente</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Correo</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Calendario</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index c387fa2..ff7600b 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -1,591 +1,694 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtro de Categorías</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Seleccione uno o más grupos</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Leyendo configuración...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Borrar
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Instalar</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Reinstalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Renovar)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Espacio disponible</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Usuario pulsó ABORTAR ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proceso abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Guardar salida</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forzar dependencias</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forzar reinstalar</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forzar borrar</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forzar sobreescribir</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Nivel de información</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Sólo errores</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Mensajes normales</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Mensajes informativos</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Salida de soluciones</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>Tratando con el paquete %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Eliminando enlaces simbólicos...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Creando enlaces simbólicos para %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Creando enlaces simbólicos para %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Finalizado</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Eliminando entrada de estado...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>fichero de estado - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>paquete - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>No pude abrir fichero de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>No pude crear fichero temporal de estado - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>No pude iniciar proceso ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>No pude abrir :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Creando directorio </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Enlazando %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Fallo al enlazar %1 a %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>Eliminado %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Fallo al borrar %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Eliminado </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Fallo al borrar </translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestor de Paquetes</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Escriba aquí el texto a buscar.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Pulse aquí para esconder la barra Salto Rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Actualizar listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Pulse aquí para actualizar las lista de paquetes de los servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Renovar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Pulse aquí para actualizar todos los paquetes instalados si se dispone de una nueva versión.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Pulse aquí para descargar los paquetes seleccionados actualmente.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Aplicar cambios</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Pulse aquí para instalar, borrar o renovar los paquetes instalados actualmente.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Mostrar paquetes no instalados</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Pulse aquí para mostrar los paquetes disponibles que no han sido instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Mostrar paquetes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Mostrar paquetes actualizados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Pulse aquí para mostrar los paquetes actualmente instalados en este dispositivo que tienen una versión más nueva disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrar por categoría</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Pulse aquí para listar paquetes que pertenecen a una categoría.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Fijar categoría del filtro</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Pulse aquí para cambiar la categoría de paquetes que serán filtrados.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Pulse aquí para buscar texto en el nombre de los paquetes.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Pulse aquí para buscar el siguiente nombre de paquete que contenga el texto que está buscando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Teclas de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Pulse aquí para mostrar/esconder el teclado que permite moverse rápidamente a través de la lista de paquetes.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Pulse aquí para esconder la barra de búsqueda.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Pulse aquí para seleccionar una fuente de paquetes.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paquetes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Ésta es una lista de todos los paquetes del servidor selecionado arriba.
 
 Un punto azul junto al nombre del paquete indica que está instalado actualmente.
 
 Un punto azul con una estrella indica que hay una versión más moderna disponible.
 
 Pulse en el recuadro de la izquierda para seleccionar un paquete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Pulse aquí para desinstalar los paquetes seleccionados.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista del servidor:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construyendo lista de paquetes para:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Instalado en - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Descripción - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Tamaño - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Sección - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Nombre fichero - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">Ver. instalada - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">Ver. disponible - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Refrescando listas de paquetes del servidor</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATENCIÓN: ¡No se recomienda
 actualizar mientras
 Opie/Qtopia está corriendo!
 
 ¿Está seguro?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Renovando paquetes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>¿Está seguro que desea borrar
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>¿Está seguro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Descargar a dónde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Introduzca carpeta donde descargar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Instalar paquete remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Introduzca localización del paquete</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>No hay nada que hacer</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>No hay paquetes seleccionados</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>¿Desea borrar o reinstalar
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Borrar o reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Borrar o actualizar</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Actualizando lanzador...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Descripción&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Instalado en&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Tamaño&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Selección&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Nombre de fichero&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versión instalada&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versión disponible&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Información del paquete</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>No dispongo de información del paquete</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Paquetes instalados</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Paquetes locales</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Paquete - %1
+             versión - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+             versión inst - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>Cadena de versión vacía.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Época en versión no numérica.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Nada después del punto en el número de verisión.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Borrar</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Dirección:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Servidor activo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Posición:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Enlazar a root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Habilitada</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Nombre usuario:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Clave:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/backgammon.ts b/i18n/es/backgammon.ts
index 4eb9e18..7526bef 100644
--- a/i18n/es/backgammon.ts
+++ b/i18n/es/backgammon.ts
@@ -1,2 +1,170 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Rescatar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Eliminar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Exponer&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Proteger&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Seguro&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vacío&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Valores predefinidos</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Ayuda</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Traer las piezas fuera de la zona final</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Eliminar una pieza del oponente</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Exponer sus propias piezas.
+Después de ese movimiento sólo una pieza permanecerá en la casilla</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Proteger una sóla pieza
+colocando otra en esta casilla</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Mover pieza a una casilla ya
+ocupada por el jugador</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Mover pieza a una casilla vacía</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Pulse y mantenga el botón ?
+junto a un campo para obtener ayuda</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuevo</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Cargar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Juego</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Predefinidos</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Jugador</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>IA</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Reglas</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>¿tema borrado %1?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Cargar tema</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;sin movimiento&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Ganó el jugador 1. Pulse en el tablero para jugar de nuevo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Ganó el jugador 2. Pulse en el tablero para jugar de nuevo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Turno J2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;Turno J1&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index f1b0f41..e04d750 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -1,52 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Copiar y restaurar... trabajando...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>Error del Sistema:
+</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>¡Copia fallida!</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Detalles</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>Copia y restauración.. ¡¡Falló!!</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Copia exitosa.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>Por favor, seleccione algo a restaurar.</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>Restauración fallida.</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Incapaz de abrir fichero: %1</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>Restauración exitosa.</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Copia de seguridad</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Guardar en</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Copia de seguridad</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleccionar fuente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Columna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Actualizar lista ficheros</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>Información de error</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>Mensaje de error:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;Ok</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/bounce.ts b/i18n/es/bounce.ts
index 7e3c9d3..27f6f3a 100644
--- a/i18n/es/bounce.ts
+++ b/i18n/es/bounce.ts
@@ -1,107 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Rebote</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nuevo juego</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Parar juego</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Juego</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Puntos: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Vidas: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Completado: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Tiempo: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Nivel Rebote %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Puntos: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Juego detenido.
 ¡Pulse P para continuar!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>¡Fin del juego!
 Puntos: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Tiempo: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Vidas: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Completado: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Completado: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Completado con éxito más del 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 puntos: 15 puntos por vida
 </translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 puntos: Bonus
 </translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 puntos: Puntos totales
 </translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>En el nivel %1.
 ¡Tiene %2 vidas esta vez!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>Sobre</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Escrito por: Stefan Schimanski
+Migración por: Martin Imobersteg
+
+Haga clic para formar paredes.
+Espacio para conmutar la dirección.
+Intente reducir el espacio total un 75%.
+
+Este programa se distribuye bajo
+los términos de la GPL v2.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/calibrate.ts b/i18n/es/calibrate.ts
new file mode 100644
index 0000000..2626c86
--- a/dev/null
+++ b/i18n/es/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Pulse sobre las cruces firmemente y con
+pecisión para calibrar la pantalla.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Bienvenido a Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index b50c010..1c55e32 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,520 +1,524 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Otro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduzca aquí el banco de esta chequera.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número cuenta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduzca aquí el nº de cuenta de esta chequera.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduzca aquí el nº PIN de esta chequera.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Balance inicial: </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduzca aquí el balance inicial de esta chequera.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduzca aquí culaquier información adicional de esta chequera.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Balance actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Esta área muestra el balance actual en esta chequera.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ésta es una lista de todas las transacciones de esta chequera.
 
 Para ordenar las entradas por un campo específico, pulse el nombre de la columna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Cantidad</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Pulse aquí para añadir una nueva transacción.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleccione una transacción y pulse aquí para editarla.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione el gráfico deseado y pulse el botón Dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Seleccione aquí el tipo de gráfico deseado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Balance cuenta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retiradas por categoría</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoría</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dibujar</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Pulse aquí para dibujar el gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Balance actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger con clave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Pulse aquí para des/habilitar protección con clave de esta chequera.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme clave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Por favor, confirme su clave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Por favor, introduzca su clave para deshabilitar la protección con clave:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Chequera</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduzca símbolo de la moneda:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduzca aquí su símbolo de moneda local.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostrar si la chequera está
 protegida con clave</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar que la chequera está protegida con clave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar balances chequera</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar el balance actual para cada chequera.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Pulse aquí para crear una nueva chequera.
 
 Puede también seleccionar Nueva del menú.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Seleccione una chequera y pulse aquí para editarla.
 
 Puede también seleccionar Editar del menú, o mantener pulsado el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleccione una chequera y pulse aquí para borrarla.
 
 Puede también seleccionar Borrar del menú.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Esta es una lista de todas las chequeras disponibles.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Borrar chequera</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nobre de la chequera</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Balance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Diversión</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Películas</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Electrónica</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/clock.ts b/i18n/es/clock.ts
index 1b8789b..9e7ae6f 100644
--- a/i18n/es/clock.ts
+++ b/i18n/es/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Cabezadita</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Reloj</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Crono</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Fijar alarma</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarma activada</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarma desactivada</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Fijar fecha y hora.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Reloj: alarma perdida.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarma ajustada: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Fijar Alarma</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Cabezadita
 (minutos)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>alarma mp3</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 499010d..0dad7a2 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -1,809 +1,836 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Duración de la cita más larga
 que el intervalo de repetición.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar cita</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendario es incapaz de
 salvar tus cambios.
 Libere espacio y vuelva a intentarlo.
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconocido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>¡Error!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Arréglalo</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Cita duplicada</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>diálogo de error</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Emitir esta aparición</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Comienzo de las citas</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora inicio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuración de la alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prefijar alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Miscelánea</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo filas:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medianas</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grandes</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista preferida:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista semanal</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Saltar a hora actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Visualización de la hora</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inicio-fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMXJVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">Lu</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Ma</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mi</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>J</translation>
+        <translation type="obsolete">Ju</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">Vi</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sa</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>p</translation>
+        <translation type="obsolete">Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetición...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Cada día...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Cada semana...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Cada mes...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Cada año...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Hora inicio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nueva Cita</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunión</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almuerzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Ene 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenciosa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Audible</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descripción </translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inicio - Fin </translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almuerzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>El %1 %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ª</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ª</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>No repetir</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>Día(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mes(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>días</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source> and </source>
         <translation> y </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 y </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, y </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>en </translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita Periódica </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Terminar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mié</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Var semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>años</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/drawpad.ts b/i18n/es/drawpad.ts
index 8b702ae..0ed1e49 100644
--- a/i18n/es/drawpad.ts
+++ b/i18n/es/drawpad.ts
@@ -1,440 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Borrar todo</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importar...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exportar...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Herramientas</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nueva página</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpiar página</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Borrar página</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Deshacer</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Rehacer</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Primera página</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Página anterior</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Página siguiente</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Última página</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Pintar punto</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Pintar línea</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Pintar rectángulo</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Pintar rectángulo relleno</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Pintar elipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Pintar elipse relleno</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Rellenar región</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Borrar punto</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Ancho lápiz</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Color lápiz</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Color relleno</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ver miniaturas</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Ver miniaturas...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Info página</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Info página...</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Suavizar bordes</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>¿Quiere limpiar la
 página actual?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>¿Quiere borrar la
 página actual?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>¿Quiere borrar todas
 las páginas?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Pulse aquí para añadir una nueva hoja.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Pulse aquí para borrar la hoja actual.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Pulse aquí para eliminar la hoja actual.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>Pulse aquí para deshacer la última acción.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>Pulse aquí para rehacer la última acción.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>Pulse aquí para ver la primera página.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>Pulse aquí para ver la página anterior.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>Pulse aquí para ver la página siguiente.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>Pulse aquí para ver la última página.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>Pulse aquí para seleccionar una de las herramientas disponibles para dibujar líneas.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>Pulse aquí para seleccionar una de las herramientas disponibles para dibujar rectángulos.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>Pulse aquí para seleccionar una de las herramientas disponibles para dibujar elipses.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>Pulse aquí para seleccionar la herramienta de texto.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>Pulse aquí para seleccionar la herramienta de relleno.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>Pulse aquí para seleccionar la herramienta de borrado.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>Pulse aquí para seleccionar el grosor del lápiz.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>Pulse aquí para seleccionar el color al dibujar.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>Pulse aquí para seleccionar el color al rellenar áreas..</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>Pizarra - Página %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Selección de páginas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Actual</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Rango</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Exportar como</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Formato:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>Pizarra - Exportar</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Todas las imágenes</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>Vistazo automático</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Vistazo</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>Pizarra - Importar</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Todas las imágenes</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nueva Página</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Blanco</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Color del lápiz</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Color de relleno</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Ancho:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Alto:</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Info página</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Ancho:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Alto:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Título: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Dimensión: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Fecha: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insertar texto</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Pizarra - Ver miniaturas</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpiar página</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>¿Quiere limpiar la
 página seleccionada?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Borrar página</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>¿Quiere borrar la
 página seleccionada?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Pulse aquí para añadir una nueva hoja.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Pulse aquí para borrar la hoja actual.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Pulse aquí para eliminar la hoja actual.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>Pulse aquí para subir la hoja actual una posición en la lista.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>Pulse aquí para bajar la hoja actual una posición en la lista.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/euroconv.ts b/i18n/es/euroconv.ts
index 4eb9e18..5f508d1 100644
--- a/i18n/es/euroconv.ts
+++ b/i18n/es/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Euroconv</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/filebrowser.ts b/i18n/es/filebrowser.ts
deleted file mode 100644
index 2587045..0000000
--- a/i18n/es/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Gestor Ficheros</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Carpeta</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordenar</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>por nombre </translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>por tamaño </translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>por fecha </translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>por tipo </translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Ascendente</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Oculto</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Enlaces</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Miniaturas</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Vista</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Carpeta anterior</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Carpeta superior</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nueva carpeta</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Gestor Ficheros</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>No puedo mostar /dev/.</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Renombrar fichero</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>¡Renombrar falló!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Pegar fichero</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>¡Pegar falló!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Cortar fichero</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>¡Cortar falló!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>¿Está seguro?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>¡Borrar falló!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nueva carpeta</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>¡Crear carpeta falló!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Lanzar aplicación</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>¡Aplicación falló!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Añadir a documentos</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Ejecutar</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Ver como texto</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Renombrar</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Pegar</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Cambiar permisos</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Seleccionar todo</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Deseleccionar todo</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Cambiar permisos</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Fijar permisos fichero</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Fijar permisos fichero para:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>propietario</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>grupo</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>otros</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Propietario</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>leer</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>escribir</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>ejecutar</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/formatter.ts b/i18n/es/formatter.ts
index 6ce0ea0..7838566 100644
--- a/i18n/es/formatter.ts
+++ b/i18n/es/formatter.ts
@@ -1,173 +1,221 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formateador</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tipo almacenamiento</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Sistemas ficheros</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatear</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>Atención:
+        <translation type="obsolete">Atención:
 ¡¡Cambiar los parámetros de esta página
 puede causar que susistema deje de
 funcionar correctamente!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>Editar fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Verificar disco</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Punto montaje</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>¿¡¿Formatear?!?</translation>
+        <translation type="obsolete">¿¡¿Formatear?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>¿¡¿Confirma el formateo
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 con </translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation> sistema de ficheros?!?
+        <translation type="obsolete"> sistema de ficheros?!?
 ¡¡Perderá todos sus datos!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>No pude formatear.
 Tipo desconocido</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Salida del Formateador</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Intentando desmontar.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>¡Fallo al desmontar!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>No pude desmontar.
 ¡Dispositivo ocupado!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Intentando formatear.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>¡No existe el dispositivo!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 ha sido formateado con éxito.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Intentando montar.</translation>
+        <translation type="obsolete">Intentando montar.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>¡Fallo al montar tarjeta!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 ha sido montado con éxito.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>Ahora puede cerrar la ventana de salida.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interno</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Tipo almacenamiento : </translation>
+        <translation type="obsolete">Tipo almacenamiento : </translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Total: %1 KB ( %d MB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Usado: %1 KB ( %d MB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponible: %1 KB ( %d MB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>ATENCIÓN:
+¡Cambiar parámetros en esta página
+puede causar que su sistema
+deje de funcionar correctamente!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>¿Formato?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>
+con el sistema de ficheros %1?
+¡¡Perderá todos los datos!!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>Intentando desmontar %1.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>Intentando montar %1.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1
+ha sido montado con éxito.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Tipo de almacenamiento: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Tipo: %1
+Formateado con %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/helpbrowser.ts b/i18n/es/helpbrowser.ts
index d3c4fb5..fc370a9 100644
--- a/i18n/es/helpbrowser.ts
+++ b/i18n/es/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Atrás</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Adelante</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Añadir marcador</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Borrar marcador</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Navegador de ayuda</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>NavegadorAyuda</translation>
+        <source>Go</source>
+        <translation>Ir</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index f26d434..959e492 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -1,248 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predeterminados</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Cambiar teclas de dirección</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Tecla indefinida</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nuevo</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall de la fama</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Salir</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Ocultar cursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>Seleccionar &amp;esquema gráfico</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pa&amp;rar en segundo plano</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Continuar en primer plano</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Cambiar &amp;teclas...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Juego de pacman para KDE
 
 Programa basado en el código de ksnake
 de Michel Filippi (mfilippi@sade.rhein-main.de).
 Diseño fuertemente influenciado por pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Quiero agradecer a mi novia Elke Krueers sus
 últimos 10 años de amistad.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>Error de configuración</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation>No hay esquemas definidos, o
-no seleccionó ningún esquema.</translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@FONTNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FIN DEL JUEGO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JUGADOR 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>¡PREPARADO!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>CARÁCTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>APODO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SOMBRA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;INTERMITENTE&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-RÁPIDO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;MEÑIQUE&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-VERGONZOSO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;TINTADO&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PULSE EL CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> PUNTUACIÓN MAX </translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    ENHORABUENA      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   HA CONSEGUIDO    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UNA BUENA PUNTUACIÓN.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>CLAS   PTS   NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@PIXMAPNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Error al iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index 23a7e6f..1b26e47 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configuración del Lanzador</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra de tareas</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menú O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Cargar applets en el Menú O:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pestañas del lanzador en el Menú O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Verificar los applets que quiere incluir en el Menú O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Añadir el contenido de las pestañas del Lanzador como menú en el Menú O.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Muestra 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Muestra 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Pestaña Editar</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Inconos</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vista previa %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta es una somera visión de como se verá la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar una letra personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Reglado</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Color sólido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleccionar...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Color:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pestañas del Lanzador:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>barra tonta</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Habilitar indicador de ocupado grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Habilitar indicador de ocupado parpadeante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleccione la pestaña del lanzador que quiere editar o borrar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Añadir una nueva pestaña al Lanzador.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Abrir un nuevo diálogo para personalizar la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Borra una pestaña del Lanzador.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Active esto si quiere un gran indicador de ocupado en el medio de la pantalla en vez de el de la barra de tareas.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Todas las pestañas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>No implementado todavía</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Cargar applets el la barra de tareas:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Compruebe los applets que quiere ver en la barra de tareas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libmpeg3plugin.ts b/i18n/es/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/en/libmpeg3plugin.ts
+++ b/i18n/es/lib.ts
diff --git a/i18n/es/libbatteryapplet-ipaq.ts b/i18n/es/libbatteryapplet-ipaq.ts
deleted file mode 100644
index e63cf3d..0000000
--- a/i18n/es/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Estado Batería iPAQ</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation>Fallo</translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation>No pude abrir fichero</translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation>Cargando ambos dispositivos</translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation>Cargando</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>Porcentaje batería restante</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>Estado batería:</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>Bien</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>Baja</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>Muy baja</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>Crítica</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>Desconocido</translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation>Alimentación emergencia</translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation>Alimentación conectada</translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation>Alimentación externa desconectada</translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation>Duración batería restante</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>Porcentaje batería restante:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>Duración batería restante:</translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation>Sin chaqueta con batería insertada</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libclockapplet.ts b/i18n/es/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/es/libclockapplet.ts
+++ b/i18n/es/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/es/libdialup.ts b/i18n/es/libdialup.ts
deleted file mode 100644
index 152b51d..0000000
--- a/i18n/es/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation>Marcación </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Contraseña:</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Teléfono:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation>Módem</translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation>AT-dial:</translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation>ATDT</translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation>ATDP</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Velocidad:</translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation>4800</translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation>9600</translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation>19200</translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation>38400</translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation>57600</translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation>115200</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Tiempo espera:</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation>seg</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Control flujo:</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Control flujo hardware</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Petición marcado</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Conexión y desconexión manual</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> segundos</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Interrupción inactivo:</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Conexión y desconexión automática</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Conexión manual, desconexión automática</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Autodetectar nombre servidores</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Pasarela</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Autodetectar encaminamineto</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Primer DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Segundo DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation>Dispositivo:</translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation>IrDa</translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation>PCMCIA</translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation>Serie</translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>Esperando actividad</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Inicializando módem</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>Conectando</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Autentificando</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Sin tono marcado</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Sin portadora</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Número ocupado</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Espera agotada</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Falló la conexión</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Falló la autentificación</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Conectado</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Configuración proxy</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Sin proxies</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Autoconfigurar proxies</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Fijar proxies</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Configuración:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Puerto:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Máquina:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Sin proxies para:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libflatstyle.ts b/i18n/es/libflatstyle.ts
index 4eb9e18..6e69a24 100644
--- a/i18n/es/libflatstyle.ts
+++ b/i18n/es/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Plano</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libinterfaces.ts b/i18n/es/libinterfaces.ts
index 76088b2..48fb2c5 100644
--- a/i18n/es/libinterfaces.ts
+++ b/i18n/es/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Información Avanzada del Interfaz</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Interfaz</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>Información DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>Servidor DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Alquiler expira</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Alquiler obtenido</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Dirección MAC</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Información del Interfaz</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Refrescar</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>&amp;Parar</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>Re&amp;iniciar</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Empezar</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Dirección MAC</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Difusión</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>&amp;Ver información avanzada</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation>ser &amp;silencioso</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Configuración del Interfaz</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Levantar automáticamente</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Configuración IP estática</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Máscara de subred</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Primer DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Dirección IP</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Pasarela</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Segundo DNS</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>Reiniciando interfaz</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libkppp.ts b/i18n/es/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/es/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/liblan.ts b/i18n/es/liblan.ts
deleted file mode 100644
index 16748cc..0000000
--- a/i18n/es/liblan.ts
+++ b/dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation>Configurar red local</translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation>Este nombre ya
-existe. Por favor, elija
-uno diferente.</translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation>LAN </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Cuenta</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation>Especificar información TCP/IP</translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation>Obtener información TCP/IP automáticamente</translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation>TCP/IP</translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation>Dirección IP</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Pasarela</translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation>Máscare subred</translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation>Difusión</translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation>DNS</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Primer DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Segundo DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxies</translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation>Impreso2</translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation>Servicio:</translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation>Dirección IP:</translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Configurar proxies</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Sin proxies</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Auto-configurar proxies</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Fijar proxies</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Configuración:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Puerto:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Máquina:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Sin proxies para:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index 953197c..a124a27 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Líquido</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation>Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sin transparencias</translation>
+        <translation>Sin transparencia</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation>Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
         <translation>Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation>Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
         <translation>Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation>Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation>Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
         <translation>Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation>Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto del menú sombreado</translation>
+        <translation>Usar texto del munú sombreado</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botones planos en barra herramientas</translation>
+        <translation>Botones de barra de herramientas planos</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Puntear contraste</translation>
+        <translation>Contraste punteado</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation>Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo Líquido de alto rendimiento por Mosfet</translation>
+        <translation>Estilo de alto rendimiento Liquid por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/librestartapplet.ts b/i18n/es/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/en/librestartapplet.ts
+++ b/i18n/es/libmodplugin.ts
diff --git a/i18n/es/libnetmonapplet.ts b/i18n/es/libnetmonapplet.ts
deleted file mode 100644
index 12984a7..0000000
--- a/i18n/es/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation>Red desconectada</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation>Desconectar</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation>Contraseña de red</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Conectar</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation>Contraseña para %1:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index f40571d..328e2dd 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -1,108 +1,659 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Botón Calendario</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Botón Contactos</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Botón Menú</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Botón Correo</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Botón Inicio</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Botón Grabación</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Rotación de la pantalla</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Minúscula+Arriba</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Minúscula+Abajo</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Minúscula+Derecha</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Minúscula+Izquierda</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Mayúscula+Arriba</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Mayúscula+Abajo</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Mayúscula+Derecha</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Mayúscula+Izquierda</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Tono:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Saturación:</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Valor:</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rojo:</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Verde:</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Azul:</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Canal alfa:</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Seleccione color</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Más</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Más...</translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Nombre:</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamaño</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Tipo mime</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Grande</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Mediana</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Pequeña</translation>
+    </message>
+</context>
+<context>
+    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mes</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Año</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frecuencia</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Finalizar el:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sin fecha final</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir el</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>VarSemana</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Sin fecha final</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>días</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>día</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>semanas</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>semana</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>meses</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>mes</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>años</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>año</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation> y </translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+y </translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, y </translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>No repetir</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>día(s)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Repetir el</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Lun</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Mie</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Jue</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Vie</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sáb</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Dom</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>semana(s)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Repetir cada</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Día</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>mese(s)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>año(s)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Cada</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>en </translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Ficheros</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos los ficheros</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Prioridad:</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Muy alta</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Alta</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Baja</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Muy baja</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Progreso:</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Fecha lí­mite:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Categoría:</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>Correo-e preferido: </translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Oficina: </translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Web trabajo: </translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Teléfono trabajo: </translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Fax trabajo: </translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Móvil trabajo: </translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Busca trabajo: </translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Página web personal: </translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Teléfono casa: </translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Fax casa: </translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Móvil personal: </translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>Todos correos-e: </translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Profesión: </translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Ayudante: </translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Superior: </translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Hombre</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Mujer</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Género: </translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Cónyuge: </translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Cumpleaños: </translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Aniversario: </translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Hijos: </translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Apodo: </translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Notas: </translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Localidad: </translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Esta cita dura todo el día</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Esta cita dura varios días</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Inicio:</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Final:</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Nota:</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Cada</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 cada </translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>El %1 cada </translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Cada </translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Lunes</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Martes</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Miércoles</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Jueves</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Viernes</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Sábado</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Domingo</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>El %1 %2 de cada</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>º</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>º</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>º</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>º</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libopieobex.ts b/i18n/es/libopieobex.ts
index d006e47..a9c5d94 100644
--- a/i18n/es/libopieobex.ts
+++ b/i18n/es/libopieobex.ts
@@ -1,124 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">OBEX Enviando</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Enviando:</translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">OBEX Recibiendo</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">EtiquetaTexto1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Fichero</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Se emitió un fichero
-para usted.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Insertar</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Rechazar</translation>
-    </message>
-</context>
-<context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recibido:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceptar</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Denegar</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Ha recibido un fichero de tipo %1 (&lt;img src=&quot;%2&quot;&gt; ) ¿Qué quiere hacer?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Enviando:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Hecho</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>¡Infrarojos no habilitados!</translation>
+        <translation>¡Infrarrojos no habilitados!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Buscando dispositivos IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth no está disponible</translation>
+        <translation>Bluetooth no disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Buscando dispositivos bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Programando para emitir.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>Pulse para emitir</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Intento %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Buscando de nuevo IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Comenzar envío</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 38b016f..a90b130 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -1,898 +1,957 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Trabajo</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nueva categoría</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nueva categoría </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoría</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorías</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicación</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Aquí van las categorías</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Verificar las categorías a las que pertenece este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Introduzca una nueva categoría aquí. Pulse &lt;b&gt;Añadir&lt;/b&gt; para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Introduzca una nueva categoría a la izquierda y pulse para sumarla a la lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pulse para borrar la categoría resaltada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Verificar que esta propiedad está disponible en todas las aplicaciones.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Lo siento, otra aplicación está
 editando las categorías.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorías</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostar Enero del año seleccionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostar el mes anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostar el mes siguiente</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostar Diciembre del año seleccionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Cerrar selección fichero</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostar documentos de este tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostar documentos de esta categoría</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Pulse para seleccionar un documento de la lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o selecione &lt;b&gt;Nuevo dcumento&lt;/b&gt; para crearlo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Mantenga pulsado para las propiedades del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Cadena no encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Final alcanzado, empezando por el principio</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Qué buscar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Iniciar búsqueda el:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Distinguir may/min</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Buscar hacia atrás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Ver documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Falló al borrar fichero.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copiar de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fallo al copiar fichero.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Fallo al mover documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentario:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localización:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Carga rápida (consume memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>El medio en el que reside el documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>El nombre de este documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Precargar esta aplicación para disponibilidad instantánea.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Borrar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Hacer una copia de este documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emitir este documento a otro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Usar rotación personalizada</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Información del propietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduzca código</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Hubo un problema creando
 la información de configuración
 de este programa.
 
 Por favor, libere espacio e
 inténtelo de nuevo.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Incapaz de crear ficheros de inicio.
 Por favor, libere espacio antes
 de introducir datos</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>¿Seguro que quiere borrar
+        <translation type="obsolete">¿Seguro que quiere borrar
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Correos-e: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Teléfono casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Móvil personal: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Web personal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Web trabajo: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Oficina: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Teléfono trabajo: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax trabajo: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Móvil trabajo: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Busca trabajo: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profesión: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Ayudante: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Superior: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Hombre</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Mujer</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Cónyuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Cumpleaños: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apodo: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>2º nombre</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apellidos</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Cargo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Compañía</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Teléfono trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Correo-e omisión</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Móvil personal</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CP trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Web trabajo</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Superior</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Cód.portal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Web personal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Género</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apodo</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Hijos</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuevo documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mie</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jue</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation>%1 documento</translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation>Qué es esto...</translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Pulse para cerrar esta ventana, descartando los cambios.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Pulse para cerrar esta ventana.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Pulse para cerrar esta ventana y aplicar los cambios.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Pulse para hacer esta ventana móvil.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
     </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Qué es esto...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;¿Seguro que quiere borrar
+%1?&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation>Ene</translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation>Abr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>May</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Ago</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Oct</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dic</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 documento</translation>
+    </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>no encontré el ejecutable Reloj Mundial</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Para elegir las zonas horarias, por favor
 instale el Reloj Mundial (citytime).</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e inténtelo de nuevo</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Todos los %1 ficheros</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Todos los ficheros</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index ac43bbc..d2824b6 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -1,94 +1,94 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máx líneas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Fija el número máximo de líneas que se mostrarán en cada aniversario/cumpleaños</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Cortar línea tras X caracteres: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dias siguientes: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Cuantos días después debemos buscar</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Para activar configuración: ¡Reinicie la aplicación!</translation>
+        <translation type="obsolete">Para activar configuración: ¡Reinicie la aplicación!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Fijar color cabecera: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>¡Colores de las cabeceras!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Fijar color de entrada: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>¡Este color será usado al mostrar cumpleaños/aniversarios!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Fijar urgente
 Color si debajo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Días: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>¡Este color urgente será usado si estamos cerca de la cita!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>¡El color urgente será usado si el cumpleaños/aniversario está más próximo que los días dados!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Módulo LibretaDirecciones</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos aniversarios en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin aniversarios en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>¡La base de datos no facilita esta petición de búsqueda! ¡Por favor, actualice libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodaydatebookplugin.ts b/i18n/es/libtodaydatebookplugin.ts
index b256d03..8d1a8f3 100644
--- a/i18n/es/libtodaydatebookplugin.ts
+++ b/i18n/es/libtodaydatebookplugin.ts
@@ -1,87 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[con alarma]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Día completo</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>Mostrar localidad</translation>
+        <translation type="obsolete">Mostrar localidad</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
+        <translation type="obsolete">Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Mostrar notas</translation>
+        <translation type="obsolete">Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
+        <translation type="obsolete">Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>Mostrar sólo citas
+        <translation type="obsolete">Mostrar sólo citas
 posteriores</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
+        <translation type="obsolete">Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>¿Cuántas 
+        <translation type="obsolete">¿Cuántas 
 citas
 deben ser
 mostradas?</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
+        <translation type="obsolete">Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>Cuántos días mas</translation>
+        <translation type="obsolete">Cuántos días mas</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>Cuántos días más deben estar en el rango</translation>
+        <translation type="obsolete">Cuántos días más deben estar en el rango</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation>día(s)</translation>
+        <translation type="obsolete">día(s)</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">sólo hoy</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>DatebookPluginConfigBase</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Mostrar localidad</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Mostrar notas</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Mostrar sólo últimas citas</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Mostrar hora en línea extra</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>¿Cuántas citas deben ser mostradas?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>sólo hoy</translation>
     </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Cuántos días más deben estar en el rango</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Cuántos días mas</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Módulo Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>No hay más citas hoy</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Sin citas hoy</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libtodaytodolistplugin.ts b/i18n/es/libtodaytodolistplugin.ts
index 8a5f7e7..4a4fdd5 100644
--- a/i18n/es/libtodaytodolistplugin.ts
+++ b/i18n/es/libtodaytodolistplugin.ts
@@ -1,40 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Módulo ListaTareas</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; 1&lt;/b&gt; tarea activa:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Hay &lt;b&gt; %1&lt;/b&gt; tareas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Sin tareas activas</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Fija el número máximo de tareas que deben mostrarse</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>tareas mostradas</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Cortar línea tras X caracteres</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>tareas mostradas </translation>
+        <translation type="obsolete">tareas mostradas </translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Fija el número máximo de tareas que deben mostrarse</translation>
+        <translation type="obsolete">Fija el número máximo de tareas que deben mostrarse</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Cortar línea tras X caracteres</translation>
+        <translation type="obsolete">Cortar línea tras X caracteres</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
+        <translation type="obsolete">Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/sfcave-sdl.ts b/i18n/es/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/en/sfcave-sdl.ts
+++ b/i18n/es/libtremorplugin.ts
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/es/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libwlanplugin.ts b/i18n/es/libwlanplugin.ts
new file mode 100644
index 0000000..1bda8f0
--- a/dev/null
+++ b/i18n/es/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configuración Inalámbrica</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Especificar punto de &amp;acceso</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Especificar &amp;canal</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Gestionado</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>cualquiera</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Cifrado</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>Habilitar &amp;cifrado</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Configuración &amp;clave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Clave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Clave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Clave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Clave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Paquetes no cifrados</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Aceptar</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rechazar</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Información del Interfaz</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Estación</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Tasa</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Calidad</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruido</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Señal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/liquid-settings.ts b/i18n/es/liquid-settings.ts
deleted file mode 100644
index 5045398..0000000
--- a/i18n/es/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation>Sin transparencias</translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation>Punteado, color de fondo</translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation>Punteado, color de botón</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation>Punteado translúcido, color de fondo</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation>Punteado translúcido, color de botón</translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation>Transparencia propia</translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation>Color del menú</translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation>Color del texto</translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation>Opacidad</translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation>Usar texto sombreado</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/mailit.ts b/i18n/es/mailit.ts
index 0c8e680..f794c01 100644
--- a/i18n/es/mailit.ts
+++ b/i18n/es/mailit.ts
@@ -1,553 +1,637 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>Adjuntado</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>Tipo fichero</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>attach...</source>
         <translation>adjuntar...</translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>Añadiendo adjuntos</translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>Editar Cuenta</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>Crear nueva cuenta</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>Nombre cuenta</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>Su nombre</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>Correo-e</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>Usuario POP</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>Clave POP</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>Servidor POP</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>Servidor SMTP</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>Tamaño correo (K)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>Inactivo</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Correo</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Cuentas</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>Comprobar correo en</translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>Editar cuenta</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>Eliminar cuenta</translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation>Enviar correo</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>Componer</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>Cancelar tranferencia</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Asunto</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>Entrante</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>Saliente</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>No ha seleccionado cuenta</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>Tiene que crear una cuenta</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation>Barra de operaciones principal</translation>
     </message>
     <message>
         <source>getMail</source>
         <translation>comprobarCorreo</translation>
     </message>
     <message>
         <source>select account</source>
         <translation>seleccionar cuenta</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation>Pulse para descargar correo de todas las cuentas disponibles.
 Manténgalo pulsado para seleccionar la cuenta deseada.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation>Sin cuenta asociada</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation>No hay cuenta activa
 asociada a este correo.
 No puede ser descargado</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Respuesta desconocida del servidor&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;máquina&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;conexión reusada&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;error en paquete de conexión&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Ingreso fallido
+Verifique nombre de usuario y contraseña&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Reciviendo error</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>Ok
+</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>No pude localizar todos los ficheros
 en el correo con el asunto: </translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>
 El correo NO ha sido enviado</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>Error del adjunto</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>Ok
 </translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>Escribir correo</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation>Eximinar correo</translation>
+        <translation type="obsolete">Eximinar correo</translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation>Área de visión central</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation>Correo no descargado</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation>El correo que ha pinchado 
 no ha sido descargado todavía.
 ¿Desea hacerlo ahora?</translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Enviarlo</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Leer correo</translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>Conexión establecida</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>Ocurrió un error</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>Recuperando </translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>Completando mensaje </translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>No hay mensajes nuevos</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation> mensajes nuevos</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>No hay mensajes nuevos</translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>Búscando en DNS</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation>El asunto del correo debe introducirse aquí</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation>Puede introducir aquí los destinatarios</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation>Si desea enviar copias de su correo, pueden introducirse aquí</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation>Este botón abre el selector de direcciones con todas las direcciones de correo de Contactos OPIE</translation>
+        <translation type="obsolete">Este botón abre el selector de direcciones con todas las direcciones de correo de Contactos OPIE</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
         <translation>Introduzca aquí su correo</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation>Pulse aquí para poner su correo en la cola</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation>Este es un resumen sobre todos los adjuntos en el correo</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation>Esta es la vista del correo entrante.
 Mantiene el correo obtenido que puede
 ser visto con un doble clic en la entrada.
 El icono azul muestra cuales de estos
 correos tienen adjuntos.
 </translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation>Esta es la vista del correo saliente.
 Mantiene la cola de correos a enviar para
 que puedan ser revisados con un doble clic.</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation>Elija los destinatarios de esta lista</translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Este botón abre un selector con todas las direcciones de correo en los Contactos Opie</translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>&amp;Ver</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Correo</translation>
     </message>
     <message>
         <source>Previous</source>
         <translation>Anterior</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>Adjuntos</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>Formato del texto</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Reenviar</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation>Pulse aquí para reenviar el correo seleccionado</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation>Leer el correo anterior en la lista</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation>Leer el correo siguiente en la lista</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation>Pulse aquí para añadir un adjunto al su correo</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation>La vista de correos tiene 2 modos:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; muestra el correo como HTML con características avanzadas (sin cambio de línea estandart)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; muestra el correo como texto llano estandart&lt;/LI&gt;Pulse aquí para cambiar entre ambos modos</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation>Pulse aquí para eliminar el correo seleccionado</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation>Pulse aquí para descargar el correo seleccionado</translation>
     </message>
     <message>
         <source>reply</source>
         <translation>responder</translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation>responder al correo</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation>Pulse aquí para responder al correo seleccionado.
 Mantángalo pulsado para más opciones.</translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation>Responder a todos</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation>Pulse aquí para responder al correo seleccionado y también las direcciones CC</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>Búscando en DNS</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Conexión establecida</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>Enviando: </translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>Enviado </translation>
     </message>
     <message>
         <source> messages</source>
         <translation> mensajes</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>Instalar</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation>Pulsa aquí para instalar el adjunto en sus Documentos</translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Explorando adjuntos</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Adjunto</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Instalado</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Correo</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>Correo el cola</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>Nuevo correo</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>CC:</translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>Asunto:</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Adjunto</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation>Pulse aquí para adjuntar ficheros al su correo</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation>Este botón pone su correo en la cola de enviar</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation>Pulse aquí para crear un nuevo correo</translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation>Sin destinatario</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation>¿Enviar correo a quién?</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>Ok
 </translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation>Separador de destinatarios incorrecto</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Tiene que separar los destinatarios con ;
 y ser direcciones de correo válidas</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation>Separador de Copia a Carbón incorrecto</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Tiene que separar los destinatarios con ;
 y ser direcciones de correo válidas</translation>
     </message>
     <message>
         <source>Re: </source>
         <translation>Re: </translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation>======mensaje reenviado de </translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation> empieza======
 
 </translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation>FWD: </translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation>======fin del mensaje reenviado======</translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation> escrito en </translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>Correo-e</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/mediummount.ts b/i18n/es/mediummount.ts
index c44d711..c0796e2 100644
--- a/i18n/es/mediummount.ts
+++ b/i18n/es/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation>Global</translation>
-    </message>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation>Configuración del Montador de Medios</translation>
     </message>
+    <message>
+        <source>Global</source>
+        <translation>Global</translation>
+    </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Si un medio se inserta en este dispositivo, Opie intenta buscar documentos en el medio. En medios grandes esto puede llevar algún tiempo. Puede elegir si Opie debe examinar globalmente o por medio. También puede reconfigurar cada medio.</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Habilitar comprobación medio</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Usar configuración global</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Si un medio se inserta en este dispositivo, Opie intenta buscar documentos en el medio. En medios grandes esto puede llevar algún tiempo. Puede elegir si Opie debe examinar globalmente o por medio. También puede reconfigurar cada medio.</translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Configurar este medio. Los cambios tendrán efecto cuando la aplicación sea cerrada. Para actualizar la etiqueta de documentos necesita quitar e insertar este medio.</translation>
+    </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros de medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limitar búsqueda a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Comprobar siempre este medio</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>Configurar este medio. Los cambios tendrán efecto cuando la aplicación sea cerrada. Para actualizar la etiqueta de documentos necesita quitar e insertar este medio.</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/mobilemsg.ts b/i18n/es/mobilemsg.ts
deleted file mode 100644
index 1924221..0000000
--- a/i18n/es/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation>Mensajes:</translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation>Mensajería Móvil</translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation>Número:</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Enviar</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>Texto</translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation>Parpadeo</translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation>Nokia</translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation>País:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation>Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation>Imagen</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Mensaje:</translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation>EMS</translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation>Tab</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/netsetup.ts b/i18n/es/netsetup.ts
deleted file mode 100644
index ef8a5a7..0000000
--- a/i18n/es/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Añadir servicio de red</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>&lt;P&gt;Estos son los servicios de red disponibles para añadir.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Añadir</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Sólo un %1 puede ser añadido. Borre el actual, o cambie sus Propiedades&lt;p&gt;</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Red</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Actual</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;Estado de los servicios de red en funcionamiento.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Servicios</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Añadir...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;P&gt;Estos son los servicios de red disponibles actualmente.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eliminar</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Propiedades</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/networksettings.ts b/i18n/es/networksettings.ts
index 1b9de72..230682f 100644
--- a/i18n/es/networksettings.ts
+++ b/i18n/es/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>Añadir Conexión de Red</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Servicios</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Configuración de Red</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Conexiones</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>in</source>
         <translation>en</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Información</translation>
+        <translation type="obsolete">&amp;Información</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Configurar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Eliminar</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation>&amp;Fijar actual</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Perfil actual</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nuevo perfil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Una lista de configuraciones de red entre las que elegir</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Añadir un nuevo interfaz a la lista.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Iniciar/Parar</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Iniciar y parar el interfaz actual, da información adicional sobre el interfaz.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configurar el interfaz actual</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Eliminar el interfaz actual de la lista.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Desconectado</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Incapaz de eliminar.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Lo siento</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Por favor, seleccione un interfaz primero.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/odict.ts b/i18n/es/odict.ts
index f3383a3..3dc261d 100644
--- a/i18n/es/odict.ts
+++ b/i18n/es/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Método de búsqueda</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation>Configuración General</translation>
+        <source>New</source>
+        <translation>Nuevo</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation>Métodos de búsqueda</translation>
+        <source>Change</source>
+        <translation>Cambiar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Borrar</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>Diccionario OPIE</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Consulta:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>Métodos de búsqueda</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation>&amp;Sensible a may/min</translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation>Sólo parabras &amp;completas</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation>Permitir expresiones &amp;reg.</translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation>0 Errores</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation>1 Error</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation>2 Errores</translation>
+        <source>Settings</source>
+        <translation>Configuración</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation>3 Errores</translation>
+        <source>Parameter</source>
+        <translation>Parámetro</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation>4 Errores</translation>
+        <source>No dictionary defined</source>
+        <translation>Sin diccionario definido</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation>Hasta acertar</translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definir uno</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation>Tolerancia del &amp;error</translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation>Parámetro</translation>
+        <source>Opie-Dictionary</source>
+        <translation>Diccionario-Opie</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Fichero diccionario</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Idioma 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Degollador</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Idioma 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nuevo método de búsqueda</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Cambiar método de búsqueda</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
deleted file mode 100644
index 48d3290..0000000
--- a/i18n/es/oipkg.ts
+++ b/dev/null
@@ -1,356 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation>Opciones ipkg</translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation>-force-depends</translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation>-force-reinstall</translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation>-force-removal-of-essential-packages</translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation>-force-overwrite</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation>Gestor de Paquetes</translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation>fuentes</translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation>Paquetes</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation>Ayuda</translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation>Aplicar</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation>Cerrar sección</translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation>Secciones</translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation>Filtro: </translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation>Limpiar búsqueda</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>Cerrar búsqueda</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation>Limpiar búsqueda</translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation>Buscar</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Búsqueda</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destino: </translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation>Enlace</translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation>Cerrar destinos</translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation>Acciones sobre paquetes</translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation>Instalar</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation>Estado de paquetes</translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation>Nueva versión, instalada</translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation>Nueva versión, no instalada</translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation>Antigua versión, instalada</translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation>Antigua versión, no instalada</translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation>Antigua versión, la nueva instalada</translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation>Nueva versión, la antigua instalada</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation>documentos</translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation>ipkgfind&amp;killefiz</translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation>Sección:</translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation>Buscar: </translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation>Paquete</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation>Servidores de Paquetes</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation>Destino instalación:</translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation>Enlazar al destino root</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nuevo</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Servidores</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinos</translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation>enlazar a /</translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation>Borrar enlaces</translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation>volátil</translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation>borrable</translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation>Servidores usados: (Fuentes activas resaltadas)</translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation>
-Todo hecho.</translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation>Borrando</translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation>por favor espere</translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation>Error al eliminar </translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>Instalando</translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation>Error al instalar</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation>Descripción: </translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation>Tamaño: </translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation>otros</translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation>Nombre instalación: </translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation> en </translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation>Nombre: </translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation>Enlace: </translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destino: </translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation>Estado: </translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation>Instalar en</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation>procesando...</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opie-console.ts b/i18n/es/opie-console.ts
index e61a865..ea03f7f 100644
--- a/i18n/es/opie-console.ts
+++ b/i18n/es/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation>Configuración de parametros de marcado</translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation>Configuraciones1</translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation>Configuraciones2</translation>
     </message>
     <message>
         <source>Init string </source>
         <translation>Cadena de inicio</translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation>Cadena de reinicio</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation>Prefijo de marcado #1 </translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation>Sufijo de marcado #1 </translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation>Prefijo de marcado #2 </translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation>Sufijo de marcado #2 </translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation>Prefijo de marcado #3 </translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation>Sufijo de marcado #3 </translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation>Cadena de conexión</translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation>Cadena de colgar</translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation>Tiempo de marcado</translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation>Retardo antes de remarcar</translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation>Número de intentos</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation>Tiempo bajada DTR (0=no)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation>Detectar bps auto</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation>Modem tiene línea DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation>Desetiquetar multilínea</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation>O par de direcciones MAC</translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>Editar perfil de conexión</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Nueva conexión</translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation>Nombre perfil</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Añadir</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>Elimina&amp;r</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation>Comando a ejecutar</translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation>Variables de entorno</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>Name :</source>
         <translation>Nombre :</translation>
     </message>
     <message>
         <source>Value :</source>
         <translation>Valor :</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation>Introducta número</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation>Introduzca el número que quiere marcar. Cuando termine, pulse ok</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation>Editor base</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation>Emulación de terminal:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation>Capa IO:</translation>
     </message>
     <message>
         <source>Look</source>
         <translation>Aspecto</translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation>Primer plano:</translation>
     </message>
     <message>
         <source>Black</source>
         <translation>Negro</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Blanco</translation>
     </message>
     <message>
         <source>Gray</source>
         <translation>Gris</translation>
     </message>
     <message>
         <source>Background:</source>
         <translation>Fondo:</translation>
     </message>
     <message>
         <source>Font:</source>
         <translation>Letra:</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeña</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Mediana</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation>No puede empezar</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation>Incapaz de desdoblarme</translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation>No puede empezar</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation>Dimensiones</translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation>Editar tecla</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation>Velocidad</translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation>Control flujo</translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Paridad</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Impar</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Par</translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation>Bits de datos</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation>Bits de parada</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
         <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation>115200 baudios</translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation>57600 baudios</translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation>38400 baudios</translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation>19200 baudios</translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation>9600 baudios</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation>No conectado</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation>Tasa de baudios inválida</translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation>Dispositivo ya conectado</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configuración de perfiles</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Salvar conexión</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>LanzadorRápido</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>El botón de la concha lanza el perfil preferido. Si no hay ninguno se toman los valores por defecto</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transferir fichero...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Guardar historial</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Cerrar ventana</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Ejecutar script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Regisrar script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Salvar script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Abrir teclado...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nuevo del perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No hay conexión.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historial</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nuevo perfil</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation>Guardar perfil</translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem unido a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Introduzca aquí el nº de teléfono:</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Comandos AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Introducta número</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Este módulo no puede configurarse</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Auto conectar tras la carga</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nuevo perfil</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Consola Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Falló</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>Conexión fallida para esta sesión.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Sesión fallida</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;No pude abrir la sesión: No dueron encotrados todos los componentes.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Modo transferencia</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Recibir</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Enviar fichero</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocolo transferencia</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progreso</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Preparado</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Iniciar transferencia</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transferencia fichero</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Atención</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Ningún fichero especificado.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Enviando...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Recibiendo...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancelado</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>La transferencia de ficheros ha sido cancelada.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Operación no adminitida.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>La transferencia no pudo ser iniciada.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Sin error.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Ocurrió un error indefinido.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transferencia incompleta.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Ocurrió un error desconocido.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Fichero enviato.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Recibido</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Fichero recibido.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nombre perfil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Teclas especiales</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Perfil no válido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Por favor, introduzca un nombre de perfil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Serie</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola local</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal preferido</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Teclaro preferido</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation>Fichero sincronizado</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numero marcado: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation>Falló la marcación del número.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation>Cancelando...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Buscando modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inicializando...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation>Reinicial altavoces</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Apagando tono marcado</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Marcar número</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Línea ocupada, remarcando número</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Conexión establecida</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Olvidar</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo de terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Esquema de color</translation>
     </message>
     <message>
         <source>Font size</source>
         <translation>Tamaño letra</translation>
     </message>
     <message>
         <source>small</source>
         <translation>pequeña</translation>
     </message>
     <message>
         <source>medium</source>
         <translation>mediana</translation>
     </message>
     <message>
         <source>large</source>
         <translation>grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation>Conversiones ruptura de línea</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Bajo límites</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Fuera de límites</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Eco local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Consola Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminal X</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>negro sobre blanco</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>blanco sobre negro</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>verde sobre negro</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>ambar sobre negro</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 0e75eb6..9ba6f1c 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -1,87 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las cruces firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Ingreso</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenido a Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Contraseña incorrecta</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La contraseña es incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>Opie ha terminado por
+        <translation type="obsolete">Opie ha terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>No pude iniciar Opie.</translation>
+        <translation type="obsolete">No pude iniciar Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>No pude pasar a la nueva identidad de usuario</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>Opie fue terminado por
+una señal no capturada
+(%1)
+</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>No pude iniciar Opie.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opie-sheet.ts b/i18n/es/opie-sheet.ts
deleted file mode 100644
index c9840e3..0000000
--- a/i18n/es/opie-sheet.ts
+++ b/dev/null
@@ -1,797 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation>&amp;Bordes</translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation>&amp;Fondo</translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation>&amp;Letra</translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation>A&amp;lineación</translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation>&amp;Ancho:</translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation>&amp;Color:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation>Bordes por &amp;defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation>&amp;Estilo:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation>F&amp;ondo por defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation>&amp;Letra:</translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation>&amp;Tamaño:</translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation>&amp;Negrilla</translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation>&amp;Cursiva</translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation>Letra por &amp;defecto</translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation>&amp;Vertical:</translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation>&amp;Horizontal:</translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation>Cortar &amp;líneas</translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation>&amp;Alineación por defecto</translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation>Formatear casillas</translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Hoja de Cálculo</translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Buscar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Opciones</translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation>&amp;Buscar:</translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation>&amp;Reemplazar con:</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Buscar</translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation>&amp;Reemplazar</translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation>Reemplazar &amp;todo</translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation>&amp;Distinguir may/min</translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation>&amp;Selección actual sólo</translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation>&amp;Toda la casilla</translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation>Buscar &amp; reemplazar</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Hoja de Cálculo</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation>¡Error de inconsistencia!</translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation>¡El fichero no pudo grabarse!</translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation>¡El fichero no pudo abrirse!</translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation>¡Formato de fichero no válido!</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Grabar fichero</translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation>¿Quiere grabar el fichero actual?</translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation>N&amp;ombre fichero:</translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation>FichSinNombre</translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation>Nuevo fichero</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;Nuevo</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation>Abrir fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation>&amp;Abrir</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Grabar</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation>Grabar fichero como</translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation>Grabar &amp;como</translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation>Sobre Opie Sheet</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation>&amp;Aceptar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation>Selecionar celdilla</translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation>&amp;Selecionar celdilla</translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation>Cortar celdillas</translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation>Cor&amp;tar</translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation>Copiar celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copiar</translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation>Pegar celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation>&amp;Pegar</translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation>Pegar contenidos</translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation>Pegar cont&amp;enidos</translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation>Borrar celdillas</translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation>Insertar celdillas</translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation>C&amp;eldillas</translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation>Insertar filas</translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation>&amp;Filas</translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation>Insertar columnas</translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation>&amp;Columnas</translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation>Añadir hojas</translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation>&amp;Hojas</translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation>Celdillas</translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation>&amp;Celdillas</translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation>Altura filas</translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation>&amp;Altura</translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation>Ajustar filas</translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation>&amp;Ajustar filas</translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation>Mostrar fila</translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation>Mo&amp;star</translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation>Ocultar fila</translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation>&amp;Ocultar</translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation>Anchura columnas</translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation>&amp;Anchura</translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation>Ajustar columnas</translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation>Mostrar columna</translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation>Ocultar columna</translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation>Renombrar hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation>&amp;Renombrar</translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation>Eliminar hoja</translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation>&amp;Eliminar</translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation>Ordenar datos</translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordenar</translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation>Busrcar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Buscar &amp;&amp; reemplazar</translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation>Igual a</translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation>&amp;Igual a</translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation>Adición</translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation>&amp;Adición</translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation>Substración</translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation>&amp;Substración</translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation>Multiplicación</translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation>&amp;Multiplicación</translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation>División</translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation>&amp;División</translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation>Abrir ParanthesistempCellData-&gt;fila+fila1, tempCellData-&gt;col+col1</translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation>&amp;Abrir paréntesis</translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation>Cerrar paréntesis</translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation>&amp;Cerrar paréntesis</translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation>Coma</translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation>&amp;Coma</translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation>&amp;Fichero</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Editar</translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation>&amp;Insertar</translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation>F&amp;ormato</translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation>&amp;Datos</translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation>Fil&amp;a</translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation>Colum&amp;na</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation>&amp;Hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation>&amp;Función</translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation>E&amp;standard</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation>Suma</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation>&amp;Suma</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation>Valor absoluto</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation>&amp;Asoluto</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation>Seno</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation>Se&amp;no</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation>Arco seno</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation>A&amp;rco seno</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation>Coseno</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation>&amp;Coseno</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation>Arco coseno</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation>Arco cos&amp;eno</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation>Tangente</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation>&amp;Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation>Arco tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation>Arco tan&amp;gente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation>Arco tangente de coordenadas</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation>Arco tangente co&amp;or</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation>Exponencial</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation>&amp;Exponencial</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation>Logaritmo</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation>&amp;Logaritmo</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation>Potencia</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation>&amp;Potencia</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation>&amp;Matemática</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation>Medi&amp;a</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation>Máximo</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation>Má&amp;ximo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation>Mínimo</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation>&amp;Mínimo</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation>Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation>&amp;Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation>E&amp;stadístico</translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation>Funciones</translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation>&amp;Número de filas:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation>&amp;Número de columnas:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation>&amp;Número de hojas:</translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation>Hoja</translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation>&amp;Altura de cada fila:</translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation>A&amp;nchura de cada columna:</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation>&amp;Nombre hoja:</translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation>¡Sólo hay una hoja!</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>¿Está seguro?</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation>Mover cel&amp;dillas abajo</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation>Move&amp;r celdillas derecha</translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation>Toda la &amp;fila</translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation>Toda la &amp;columna</translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation>Opie Sheet
-Software de hoja de cálculo para Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Desarrolado por: Serdar Ozler
-Versión 1.0.2
-Fecha de publicación: 8 de octubre de 2002
-
-Este producto está bajo licencia GPL. Es distribuible libremente. Si quiere la última versión y el código fuente, por favor visite el sitio web.
-
-http://qtopia.sitebest.com</translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation>¡Error sintáctico!</translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation>¡Búsqueda no encotrada!</translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordenar</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>O&amp;pciones</translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation>&amp;Ordenar por</translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation>&amp;Luego por</translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation>Luego &amp;por</translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation>&amp;Distinguir may/min</translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation>Di&amp;rección</translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation>&amp;Bajando (filas)</translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation>De iqz a dch (&amp;columnas)</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordenar</translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation>&amp;Ascendente</translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation>&amp;Descendente</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Error</translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation>¡Una celdilla no puedo ser ordenada!</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opieftp.ts b/i18n/es/opieftp.ts
index 9387991..196f943 100644
--- a/i18n/es/opieftp.ts
+++ b/i18n/es/opieftp.ts
@@ -1,251 +1,247 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>Cliente FTP</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Conexión</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Remoto</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Conectar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desconectar</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar ficheros ocultos</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crear directorio</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Descargar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambiar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambiar a remoto</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Cambiar a configurar</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Sobre</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Carpeta</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Clave</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Servidor remoto</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Ruta remota</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Por favor, especifique servidor</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Incapaz de conectar con
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Incapaz de registrame en
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Incapaz de subir
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>No puedo subir directorios</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Incapaz de descargar
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Incapaz de listar dir
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Incapaz de cambiar dir</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Incapaz de subir a dir
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Incapaz de alcanzar dir</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambiar directorio</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Actualizar</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Quiere realmente borrar
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Debaría estar vacío</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Incapaz de crear dir
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Incapaz de borrar dir
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Incapaz de borrar fichero
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Incapaz de renombrar fichero
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ese directorio no existe</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nuevo nombre servidor</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Lo siento, nombre ya usado</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index 7f44f23..f3a195a 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -1,512 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Hablando de canales</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Discusión de canales</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escriba aquí sus mensajes para participar en la dicusión de canales</translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Petición</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Vesión</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Quien es</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Conectado, registrándome ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Registrado con éxito.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Error de conexión: </translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Conexión cerrada</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation>Recivido comando numérico desatendido : </translation>
+        <translation type="obsolete">Recivido comando numérico desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation>Recivido comando ctcp desatendido : </translation>
+        <translation type="obsolete">Recivido comando ctcp desatendido : </translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation>Recivido comando literal desatendido : </translation>
+        <translation type="obsolete">Recivido comando literal desatendido : </translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Unión de canal inexistente - ¿desincronizado?</translation>
     </message>
     <message>
         <source> joined channel </source>
-        <translation>canal unido</translation>
+        <translation type="obsolete">canal unido</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persona ya se ha unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Ya te has unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You left channel </source>
-        <translation>Deja el canal</translation>
+        <translation type="obsolete">Deja el canal</translation>
     </message>
     <message>
         <source> left channel </source>
-        <translation>dejar canal</translation>
+        <translation type="obsolete">dejar canal</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Persona separación no encontrada - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>No encontré canal para la parte - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensaje del canal de emisor desconocido</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
-        <translation>Mensaje del canal con canal desconocido</translation>
+        <translation type="obsolete">Mensaje del canal con canal desconocido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Recibido PRIVMSG de tipo desconocido</translation>
     </message>
     <message>
         <source>You are now known as </source>
-        <translation>Ahora es conocido como </translation>
+        <translation type="obsolete">Ahora es conocido como </translation>
     </message>
     <message>
         <source> is now known as </source>
-        <translation>es ahora conocimo como</translation>
+        <translation type="obsolete">es ahora conocimo como</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Cambio de apodo de una persona desconocida</translation>
     </message>
     <message>
         <source> has quit </source>
-        <translation>ha salido </translation>
+        <translation type="obsolete">ha salido </translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Ha salido persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>cambió asunto a </translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Asundo del canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recibido un CTCP PING de </translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation>Recibido un CTCP VERSION de </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con mal destinatario</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Cambio de modo de tipo desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Cambio de modo con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Cambio de modo con indicador desconocido</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Cambio de modo con kanal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modos de usuario no implentados todavía</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Ha sido expulsado de </translation>
     </message>
     <message>
         <source> by </source>
         <translation>por </translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>fue expulsado de </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Expulsión de persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Expulsión de canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Mensaje del servidor con canal desconocido</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Unido al canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Apodo en uso, por favor, reconectese con uno diferente</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>No hay tal apodo</translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Recivido comando numérico no manejado: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Recivido comando ctcp no manejado: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Recivido comando literal no manejado: %1</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>%1 unido al canal %2</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>Ha dejado el canal %1</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>%1 dejó el canal %2</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>Mensaje del canal con canal desconocido %1</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>Ahora es conocido como %1</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 es ahora conocido como %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 ha salido (%2)</translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Hablando con </translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discusión privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Escriba aquí su texto para enviar un mensaje a la otra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Desconectado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nombre del perfil :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>El nombre de este perfil del servidor en el vistazo</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Máquina :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>El servidor al que conectarse - puede ser un nombre de máquina válido o dirección IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Puerto :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>El puerto del servidor al que conectarse. Usualmente 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Apodo :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Su apodo en la red IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nombre real :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Su nombre real</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Clave :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Clave para conectarte al servidor (si es requerida)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canales :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Lista de todos los canales, seperados por comas, a los que le gustaría unirse automáticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editar información del servidor</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nombre de perfil requerido</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nombre de máquina requerido</translation>
     </message>
     <message>
         <source>Port required</source>
         <translation>Puerto requerido</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Apodo requerido</translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation>Nombre real requerido</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La lista del canal necesita contener una
 lista separada por comas de nombres
 de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Navegador lista servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Por favor, elija un perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Seleccione un perfil de servidor de esta lista y entonces pulse Ok en la esquina uperior derecha</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Borrar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Añadir un nuevo perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation>Conexión a</translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation>Mensajes del servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escriba aquí comandos. Una lista de comandos disponibles puede encontrarse en la ayuda de OpieRC</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Líneas mostradas :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Cantidad de líneas mostradas en los chats antes de que sean borradas la viejas - es necesario para restringir el consumo de memoria. Fíjelo en 0 si no neceista esto</translation>
     </message>
     <message>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Color de fondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Color del fondo que se usará en los chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Color del texto normal :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Color del texto que se usará en los chats</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Color de error :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Color del texto que se usará al mostrar errores</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Texto propio :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Color del texto que se usará para identificar el texto escrito por si mismo</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Texto ajeno :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Color del texto que se usará para identificar el texto escrito por otros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Texto escrito por el servidor :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Color del texto que se usará para identificar el texto escrito por el servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notificaciones :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Color del texto que se usará al mostrar notificaciones</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Descripción perdida</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Descripción del contenido de la pestaña</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Cerrar esta pestaña</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Ciente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Conexiones al sevidor, canales, peticiones y otras cosas serán colocadas aquí</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nueva conexión</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Crear una nueva conexión a un servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurar OpieIRC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
deleted file mode 100644
index 3de7c15..0000000
--- a/i18n/es/opiemail.ts
+++ b/dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation>Responder</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation>Resp todos</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Borrar</translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation>CC</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation>Asunto</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation>Reiniciar</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation>Cola</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Enviar</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation>De:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation>Para:</translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation>Componer</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Correo</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation>Buzones</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation>Configurar correo-e</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation>Configuración del correo-e</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation>Carpetas</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Añadir</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation>&amp;Modificar</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation>Nombre carpeta</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation>Identidad</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation>Transporte</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation>Entrada</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation>Carpeta</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Usuario</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Servidor</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation>Salida</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation>Borrar buzón</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation>¿Eliminar buzón?
-Su correos se borrarán.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation>Configurar carpeta correo-e</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation>Descripción:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation>Identidad correo-e - Configurar</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation>Firma:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Identidad:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation>Organización:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation>Correo-e:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation>Responder a</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation>Usar para envío</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation>EntradaCorreoE</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation>Carpeta destino</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Clave</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation>110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation>Activar intervalo comprobación.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation>Comprobar cada:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation> minutos</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation>&amp;Borrar correo del servidor al borrar el local.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation>&amp;Mantener correo en el servidor</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation>SalidaCorreoE</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nombre:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protocolo</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre usuario:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Clave</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation>Servidor requiere autentificación</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Puerto</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation>25</translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation>Asunto</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation>Remitente</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Fecha</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation>(Re)editar</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation>Copiar a</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation>Mover a</translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation>Impreso1</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opieplayer.ts b/i18n/es/opieplayer.ts
index cd93d64..b1e11dd 100644
--- a/i18n/es/opieplayer.ts
+++ b/i18n/es/opieplayer.ts
@@ -1,276 +1,276 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>Algo falla en el
 dispositivo sonido.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Cerrando reproductor.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Sin fichero</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Error: ningún fichero seleccionado</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>Fichero no encontrado</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>El siguiente fichero no fue encotrado: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>No encotré decodificador</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Perdón, no encontré decodificadores apropiados para este fichero: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Error abriendo fichero</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Perdón, ocurrió un error intentando abrir el fichero: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation> Fichero: </translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, Longitud: </translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Selección lista</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>Operaciones reproducción</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>Añadir a la lista</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Borrar de la lista</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Barajar</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>Bucle</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Limpiar lista</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Añadir todos los audio</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>Añadir todos los vídeos</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Añadir todos</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>Guardar lista</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>Abrir fichero o URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>Releer ficheros audio</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Releer ficheros video</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Escala</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Bajar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Subir</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Listas</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>Reproductor Opie: </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Sin espacio</translation>
+        <translation type="obsolete">Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>Hubo un problema guardando la lista.
+        <translation type="obsolete">Hubo un problema guardando la lista.
 Su lista puede haber perdido alguna entrada
 la próxima vez que la inicie.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Fichero no válido</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Hubo un problema trayendo el fichero.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>¿Borrar lista?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>¿Seguro que quiere
 borrar esta lista?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propiedades</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Reproducir seleccionados</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Abrir fichero o URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Guardar lista m3u </translation>
     </message>
     <message>
         <source>Skins</source>
         <translation>Carátulas</translation>
     </message>
     <message>
         <source>Path</source>
         <translation>Ruta</translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Reproductor Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/opieplayer2.ts b/i18n/es/opieplayer2.ts
deleted file mode 100644
index 4c6e975..0000000
--- a/i18n/es/opieplayer2.ts
+++ b/dev/null
@@ -1,240 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>Reproductor Opie</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation>Reproductor Opie: Inicializando</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>Reproductor Opie: </translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation>Fichero: </translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, longitud: </translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation>Volumen </translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation>Título</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Tamaño</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>Medio</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Ruta</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Selección lista</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Añadir a lista</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Borrar de la lista</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Reproducir</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Aleatorio</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Ciclo</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Limpiar lista</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Añadir todos los ficheros de audio</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Añadir todos los ficheros de video</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Añadir todos los ficheros</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Salvar lista</translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation>Abrir fichero o URL</translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation>Reexaminar ficheros de audio</translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation>Reexaminar ficheros de video</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Pantalla completa</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Subir</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Bajar</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Reproducir seleccionados</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Fichero no válido</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Hubo un problema obteniendo el fichero.</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>¿Borrar lista?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>¿Seguro que quiere borrar
-esta lista de reproducción?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation>Abrir fichero o URL</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>Reproductor Opie: </translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation>Salvar lista m3u</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation>Operaciones reproducción</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Fichero</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation>Carátulas</translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation>Gamma (vídeo)</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>Vídeo</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>Listas</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation>Reproductor Opie - Vídeo</translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation>Fallo</translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation>No encontré módulo de entrada para este tipo de medio</translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation>No encontré módulo decodificador para este tipo de medio</translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation>Falló la descodificación de este tipo de medio</translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation>MRL incorrecta</translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation>Algún otro error</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
new file mode 100644
index 0000000..f2e0470
--- a/dev/null
+++ b/i18n/es/opierec.ts
@@ -0,0 +1,212 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>Grabadora Opie</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Ficheros</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation>Tasa muestreo</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>Tamaño límite</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Ilimitado</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>Directorio archivo</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>Bits de muestreo</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Salida</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>Poco espacio en disco</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>Está grabando con poco
+espacio, o una tarjeta
+no ha sido reconocida</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>¿Seguro que quiere &lt;font size=+2&gt;&lt;B&gt;borrar&lt;/B&gt;&lt;/font&gt;
+el fichero seleccionado?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sí</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>No pude borrar el fichero.</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>Opierec</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>Por favor, seleccione el fichero a reproducir</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Nota</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>No pude abrir el fichero de audio.
+</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Reproducir</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>Enviar por IR</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Renombrar</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>Emitir por IR</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>Enviado por IR.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>Gra</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Lugar</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>Compresión de onda (ocupa menos)</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>Mudo auto</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>mudo</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Parar</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
new file mode 100644
index 0000000..474e393
--- a/dev/null
+++ b/i18n/es/osearch.ts
@@ -0,0 +1,143 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>Buscador O</translation>
+    </message>
+    <message>
+        <source>adressbook</source>
+        <translation type="obsolete">contactos</translation>
+    </message>
+    <message>
+        <source>todo</source>
+        <translation type="obsolete">tareas</translation>
+    </message>
+    <message>
+        <source>datebook</source>
+        <translation type="obsolete">calendario</translation>
+    </message>
+    <message>
+        <source>applications</source>
+        <translation type="obsolete">aplicaciones</translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="obsolete">documentos</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Buscar</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Buscar todo</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Sensible may/min</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Usar comodines</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Los detalles del resultado actual</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opciones</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Introduzca aquí sus términos de búsqueda</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Aplicaciones</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Tareas</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Calendario</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Contactos</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Resultados</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>mostrar</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>editar</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>ejecutar</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>abrir en el Gestor de Ficheros</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>abrir con</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>mostrar tareas completadas</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>mostrar sucesos pasados</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>buscar en fechas</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Fichero: </translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Enlace: </translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>Tipo MIME: </translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>buscar contenido</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>buscando %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index fe557e9..d489414 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -1,566 +1,562 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composición elemental (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso:</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Bloque</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energía ionización</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebullición</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusión</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrógeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Helio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berilio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrógeno</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neón</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Azufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argón</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potasio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Escandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titánio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganeso</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Hierro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Niquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Galio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Kriptón</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Estroncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ytrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnecio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Paladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Plata</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Estaño</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Teluro</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Yodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xenón</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantano</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prometio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Yterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutecio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tántalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Wolframio</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Talio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radón</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francio</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinio</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptuno</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americio</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berquelio</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einstenio</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Laurencio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerio</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Sistema Periódico</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERROR: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Datos Químicos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/patience.ts b/i18n/es/patience.ts
index f7f7ccc..00ea323 100644
--- a/i18n/es/patience.ts
+++ b/i18n/es/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Paciencia</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Casilla libre</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jugar</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>Cambiar &amp;reverso cartas</translation>
+        <translation type="obsolete">Cambiar &amp;reverso cartas</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Saltar a la posición</translation>
+        <translation type="obsolete">&amp;Saltar a la posición</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jugar</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Cambiar reverso cartas</translation>
+        <translation type="obsolete">Cambiar reverso cartas</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Saltar a la posición</translation>
+        <translation type="obsolete">Saltar a la posición</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Volver una carta</translation>
+        <translation type="obsolete">Volver una carta</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Volver tres cartas</translation>
+        <translation type="obsolete">Volver tres cartas</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Trampa</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Arpa</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Club de té</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Volver a cambiar la carta</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Saltar a la posición</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Volver a cambiar la carta</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Saltar a la posición</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Volver una carta</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Volver tres carta</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/qpdf.ts b/i18n/es/qpdf.ts
index 07323aa..0f93d08 100644
--- a/i18n/es/qpdf.ts
+++ b/i18n/es/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Ajustar al ancho</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Ajustar a página</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Abrir...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Primera página</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Página anterior</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Ir a página...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Página siguiente</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Última página</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Ir a página</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Selecione de 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>No encuentro &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>El fichero no existe!</translation>
+        <translation type="obsolete">El fichero no existe!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation>¡El fichero no existe!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index d4d69d8..2529f03 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
         <translation>La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Estado de la Batería</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation>Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation>Buscando documentos</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Ver como documentos</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado de la Batería</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/reader.ts b/i18n/es/reader.ts
index 57b8818..1936c7a 100644
--- a/i18n/es/reader.ts
+++ b/i18n/es/reader.ts
@@ -1,308 +1,793 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
+        <source>Toolbar Settings</source>
+        <translation>Configuración barra herramientas</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
+        <source>File</source>
+        <translation>Fichero</translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation>Info</translation>
+        <source>Navigation</source>
+        <translation>Navegación</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Marcas</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indicadores</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Política</translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Velocidad avance</translation>
     </message>
     <message>
-        <source>On Action...</source>
-        <translation>En acción...</translation>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Nada&gt;</translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Open file</source>
         <translation>Abrir fichero</translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation>Autoavance</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation>Marcar</translation>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Pantalla completa</translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation>Navegación</translation>
+        <source>Zoom in</source>
+        <translation>Acercar</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation>Avanzar</translation>
+        <source>Zoom out</source>
+        <translation>Alejar</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation>Saltar</translation>
+        <source>Back</source>
+        <translation>Atrás</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation>Avanzar página/línea</translation>
+        <source>Forward</source>
+        <translation>Adelante</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation>Solapar</translation>
+        <source>Home</source>
+        <translation>Inicio</translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation>Usar cursor</translation>
+        <source>Page up</source>
+        <translation>Retroceder página</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation>Diccionario</translation>
+        <source>Page down</source>
+        <translation>Avanzar página</translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
-        <translation>Uno/dos toques</translation>
+        <source>Line up</source>
+        <translation>Retroceder línea</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation>Objetivo</translation>
+        <source>Line down</source>
+        <translation>Avanzar línea</translation>
     </message>
     <message>
-        <source>Annotation</source>
-        <translation>Anotación</translation>
+        <source>Beginning</source>
+        <translation>Principio</translation>
     </message>
     <message>
-        <source>Dictionary</source>
-        <translation>Diccionario</translation>
+        <source>End</source>
+        <translation>Fin</translation>
     </message>
     <message>
-        <source>Clipboard</source>
-        <translation>Portapapeles</translation>
+        <source>Escape Button</source>
+        <translation>Botón escape</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation>Arriba</translation>
+        <source>Space Button</source>
+        <translation>Botón espacio</translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation>Abajo</translation>
+        <source>Return Button</source>
+        <translation>Botón return</translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation>Buscar...</translation>
+        <source>Left Arrow</source>
+        <translation>Flecha izquierda</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation>Contínuo</translation>
+        <source>Right Arrow</source>
+        <translation>Flecha derecha</translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation>Marcado</translation>
+        <source>Down Arrow</source>
+        <translation>Flecha abajo</translation>
     </message>
     <message>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Up Arrow</source>
+        <translation>Flecha arriba</translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
-        <translation>Ninguno</translation>
+        <source>Tidy-up</source>
+        <translation>Ordenar</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Texto</translation>
+        <source>Delete</source>
+        <translation>Borrar</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation>HTML</translation>
+        <source>Delete Bookmarks</source>
+        <translation>Borrar marcadores</translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
-        <translation>Peanut/PML</translation>
+        <source>Delete Configuration</source>
+        <translation>Borrar configuración</translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
-        <translation>Esquema</translation>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Dos/un
+toque</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Buscar</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>Internacional</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>Ideogramas</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Ancho ideograma</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Aplicar letra a
+diálogos</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codificación</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Aplicación</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensaje</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Dos/un
+toque</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Diccionario</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Intercambiar acciones
+de las pulsaciones</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation>Eliminar CR</translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation>Eliminar guiones</translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation>Espacio simple</translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation>Eliminar tabuladores</translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation>Reconstruir párrafos</translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation>Doble espacio</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation>Sangrado+</translation>
+        <source>Remap</source>
+        <translation>Reasignar</translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation>Sangrado-</translation>
+        <source>Embolden</source>
+        <translation>Animar</translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation>Re-palm</translation>
+        <source>Full Justify</source>
+        <translation>Alineación completa</translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation>Reasignar</translation>
+        <source>Text</source>
+        <translation>Texto</translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Embolden</source>
-        <translation>Animar</translation>
+        <source>Indent</source>
+        <translation>Tabular</translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation>Solapar
+página</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Zoom
+gráfico</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Margen</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Párrafo
+principal</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Línea
+principal</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Marcado</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Letra</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Ir</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Borrar</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Autogenerar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpiar</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Ordenado</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Marcar bloque</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Copiar bloque</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Flotante</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Barra sencilla</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Barra menú/herramienta</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Barra múltiple</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Arriba</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Abajo</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Derecha</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Izquierda</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Minimizada</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Móvil</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Diccionario</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Portapapeles</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Despluckar</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>Despluckar</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Contínuo</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Seleccionar acción</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Plucker</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Avanzar</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retroceder</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Retroceder página</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Avanzar página</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ir al principio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ir al final</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Saltar</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Avanzar página/línea</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>Configuración del Lector Opie</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Esquema</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>Esquema(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Localización</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Misc</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>Botones</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Guardar URL</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Portapapeles</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Fichero local</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>Fichero global</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Alejar</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation>Ideograma/palabra</translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation>Fijar anchura</translation>
+        <source>Set Font</source>
+        <translation>Fijar letra</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificación</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation>Ascii</translation>
+        <source>Ideogram</source>
+        <translation>Ideograma</translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>UTF-8</source>
-        <translation>UTF-8</translation>
+        <source>Open</source>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation>UCS-2(BE)</translation>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation>USC-2(LE)</translation>
+        <source>Fullscreen</source>
+        <translation>Pantalla completa</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navegación</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Avanzar</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Saltar</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Avanzar página/línea</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>Uno/dos toques</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Anotación</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Arriba</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Abajo</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Buscar...</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation>Palm</translation>
+        <source>Zoom In</source>
+        <translation>Acercar</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation>Windows(1252)</translation>
+        <source>Zoom Out</source>
+        <translation>Alejar</translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation>Fijar letra</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anotar</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Ir</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>Autogenerar</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpiar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation>Ordenado</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Inicio bloque</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copiar bloque</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation>Formato</translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar búsqueda</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation>Exp.reg</translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation>Cerrar edición</translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuraciones</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Guardar configuración</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Cargar configuración</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Borrar configuración</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>Barras de herramientas</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Ejecutar script</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exportar enlaces</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ir al principio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ir al final</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Avance</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Fijar objetivo</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Parar paras</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Fijar codificación</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Ideograma</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Lector</translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation>Hojear fichero</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Oculto</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/rotation.ts b/i18n/es/rotation.ts
deleted file mode 100644
index d603276..0000000
--- a/i18n/es/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Configurar Rotación</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Seleccione la orientación de entre las opciones a la izquierda.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>¿Reiniciar Opie ahora?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;Rotación no habilitada en esta demo, sin embargo en una capacidad de Qt/Empotrado.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 7b2601c..4702b56 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,106 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduzca nuevo código</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Código</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Identificación</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Identificación automática</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/snake.ts b/i18n/es/snake.ts
index 1bffea4..f40a6e2 100644
--- a/i18n/es/snake.ts
+++ b/i18n/es/snake.ts
@@ -1,43 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Serpiente</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nuevo juego</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>SERPIENTE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use el mando para guiar a la serpiente
 hacia los ratones. No debe chocar
 contra muros, orillas o su cola.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Pulse una tecla para empezar</translation>
+        <translation type="obsolete">Pulse una tecla para empezar</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>   Puntuación:  %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>¡JUEGO TERMINADO!
 Puntuación: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Pulse una tecla para empezar de nuevo.</translation>
+        <translation type="obsolete">Pulse una tecla para empezar de nuevo.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Pulse una tecla para empezar</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Pulse una tecla para comenzar un nuevo juego.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/spreadsheet.ts b/i18n/es/spreadsheet.ts
deleted file mode 100644
index 037cef1..0000000
--- a/i18n/es/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation>Hoja de cálculo</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nueva</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation>Ecuación</translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation>Borrar celda</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Fichero</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation>ControlHojaCálculo</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/es/stockticker.ts b/i18n/es/stockticker.ts
new file mode 100644
index 0000000..af213c9
--- a/dev/null
+++ b/i18n/es/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Abrir fichero</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Cerrar</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Atrás</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Adelante</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Inicio</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Añadir marcador</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fichero</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Adelante</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historial</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Preferidos</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Atrás</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Adelante</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Inicio</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Búsqueda de Símbolo</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Introduzca algo que buscar.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index d27efc5..94df81d 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -1,314 +1,298 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>En</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Usado por</translation>
+        <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>Seguro que quiere ejecutar
+        <translation type="obsolete">Seguro que quiere ejecutar
 </translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
     </message>
+    <message>
+        <source>Used by</source>
+        <translation>Usado por</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation>¿Seguro que quiere ejecutar %1 para este módulo?</translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>Seguro que quiere enviar
+        <translation type="obsolete">Seguro que quiere enviar
 </translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>Tarjeta CF: </translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation>Disco duro </translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>Tarjeta SD </translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>Disco duro /dev/hd </translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>Disco duro SCSI /dev/sd </translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>Almac. interno </translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>Este gráfico representa la memoria usada actualmente es esta tarjeta de memoria Compact Flash.</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
     <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>Este gráfico representa el almacenamiento usado en este disco duro.</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>Este gráfico representa cuanta memoria se usa actualmente en esta tarjeta Secure Digital.</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>En</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>Este gráfico representa cuanta memoria se usa actualmente de la memoria incorporada (p.e. Flash) en este dispositivo.</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>Disco RAM</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>Este gráfico representa cuánta memoria usa actualmente el disco RAM temporal.</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation>¿Seguro que quiere enviar %1 a este proceso?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;Proveedor: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página muestra la versión actual de Opie, del kernel Linux y de la distribución corriendo es este dispositivo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/systemtime.ts b/i18n/es/systemtime.ts
index 62f324b..eb259d6 100644
--- a/i18n/es/systemtime.ts
+++ b/i18n/es/systemtime.ts
@@ -1,522 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Formato hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24 horas</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24 horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12 horas</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Formato fecha</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Inicio semana</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Hora del sistema</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formato</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Predecir</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>Preguntó por un retraso de </translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation>minutos, pero sólo </translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>minutos transcurrieron desde el último ajuste.&lt;br&gt;¿Continúo?</translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation>¿Continúo?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Ejecutando:
-ntpdate</translation>
+ntpdate </translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Error al obtener la hora de la red.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Error al ejecutar ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Servidor horario</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Error al obtener la hora del
-servidor:</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> segundos</translation>
+servidor: </translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>No pude conectar con el servidor </translation>
     </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Preguntó por un retraso de %1 minutos, pero sólo %2 minutos transcurrieron desde el último ajuste.&lt;br&gt;¿Continúo?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 segundos</translation>
+    </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Hora de inicio</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>Ajuste horario</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Nueva hora</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Obtener hora de la red</translation>
     </message>
 </context>
 <context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">¿Ejecutar NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">Ejecutando:</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Error al ejecutar ntpdate</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete"> segundos</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">último [h]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">corrección [s]</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">ajuste [s/h]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete"> s/h</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtener hora de la Red</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Fijar predicción de hora: </translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">No pude conectar con el servidor </translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Predecir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Principal</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Configuración</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">error ntp</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">¡Error al obtener la hora de la Red!</translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="obsolete">Error al obtener la hora del
-servidor</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Pidió un retardo de %1 minutos, pero sólo %2 han pasado desde la última revisión. &lt;br&gt;¿Reejecuto NTP?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Hora de la Red</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtener hora de la Red</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Hora inicio:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">nan</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Ajuste de hora:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Nueva hora:</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Ajuste estimado:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Predicción de hora:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Ajuste promedio:</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Fijar predicción de hora</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Predicción de hora</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Usar</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">como</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">servidor NTP para obtener la hora de la Red.</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Esperar </translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">minutos hasta que</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">intentos NTP para sincronizar el reloj con la Red.</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">Asegurar un retraso de</translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">una nueva conexión NTP será usada para predecir la hora.</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Fijar hora</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Principal</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manual</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Configuración</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Predecir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Configuración avanzada</translation>
-    </message>
-</context>
-<context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>Predicción de deriva horaria</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Ajuste estimado</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Hora predicha</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Ajuste [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>Última [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>Corrección [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Predecir hora</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fijar hora predicha</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation> s/h</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation> segundos</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zona horaria</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Formato hora</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 horas</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 horas</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Inicio semana</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lunes</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato fecha</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Formato icono</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">Hora del Sistema</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Servidor horario</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>minutos estre actualizaciones horarias</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>minutos estre predicciones</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>Mostrar información del servidor horario</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>Mostrar información de la predicción horaria</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Obtener hora de la red</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fijar hora predicha</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/tetrix.ts b/i18n/es/tetrix.ts
index aa89e9c..5ef6a40 100644
--- a/i18n/es/tetrix.ts
+++ b/i18n/es/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>vacío</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>¡Introduzca su nombre!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Puntuaciones Máximas</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Puntos</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Nivel</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Siguiente</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Puntos</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Nivel</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Eliminado</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 2e2ca4b..3546cc3 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -1,267 +1,277 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Guardar como</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Buscar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Acercar</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Alejar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Cortar líneas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Empezar con Nuevo</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichero</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Buscar siguiente</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Cerrar Buscar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichero .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento enlazado</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insertar hora y fecha</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Opciones avanzadas</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Preguntar al salir</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Abrir siempre fichero enlazado</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Barra de búsqueda abierta</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Ir a línea...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Autograbar 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Editor de Textos ha detectado que &lt;BR&gt;seleccionó un fichero &lt;B&gt;.desktop&lt;/B&gt;. ¿Abro el fichero &lt;B&gt;.desktop&lt;/B&gt; o su &lt;B&gt;enlace&lt;/B&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>Fallo al escribir</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir Letra</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+        <translation type="obsolete">¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del disco?&lt;BR&gt;¡¡Es &lt;B&gt;irreversible&lt;/B&gt;!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation>Editor de Textos</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Editor de Textos ha detectado que
 tiene cambios sin salvar.
 ¿Los guardo?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>No guardar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Líneas insuficientes</translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Editor de Textos</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+del disco?&lt;BR&gt;¡Es &lt;B&gt;irreversible&lt;/B&gt;!</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>otros</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>leer</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escribir</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Aviso</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Error - sin usuario</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Error - sin grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Error fijando propietario o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permisos fichero</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/tictac.ts b/i18n/es/tictac.ts
index 9fb4dda..29fdca9 100644
--- a/i18n/es/tictac.ts
+++ b/i18n/es/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>TicTac</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Empieza el ordenador</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Empieza el humano</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Juegar!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pulsa Jugar para empezar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Haz tu movimiento</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>¡Tú ganas!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>¡El ordenador gana!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/tinykate.ts b/i18n/es/tinykate.ts
new file mode 100644
index 0000000..0704e47
--- a/dev/null
+++ b/i18n/es/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>MiniKATE</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuevo</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Guardar como</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fichero</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Letra +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Letra -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Utililidades</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Resaltado</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuración</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Sin nombre %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 5fc1ac6..75e2b01 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,119 +1,182 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Piche aquí para lanzar la aplicación asociada</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoy por Maximilian Reiß</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Configuración de Hoy</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>minutos inactivo</translation>
+        <translation type="obsolete">minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
+        <translation type="obsolete">Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
+        <translation type="obsolete">Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Tamaño del icono</translation>
+        <translation type="obsolete">Tamaño del icono</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Fijar el tamaño del icono en pixel</translation>
+        <translation type="obsolete">Fijar el tamaño del icono en pixel</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>¿Arrancar
+        <translation type="obsolete">¿Arrancar
 al encender?
 (sólo Opie)</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Actualizar</translation>
+        <translation type="obsolete">Actualizar</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Con qué frecuencia debe Hoy actualizarse</translation>
+        <translation type="obsolete">Con qué frecuencia debe Hoy actualizarse</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation> seg</translation>
+        <translation type="obsolete"> seg</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>nunca</translation>
+        <translation type="obsolete">nunca</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Pulse en las casillas para activar un módulo o use los botones de desplazamiento para cambiar el orden de aparición</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Configuración de Hoy</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>Form1</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>¿arrancar al encender?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>mini-avisos</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Tiene aviso pequeño</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>minutos inactivo</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>pixel</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Fijar el tamaño del icono en pixel</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>tamaño del icono</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation> seg</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>nunca</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Con qué frecuencia debe Hoy actualizarse</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>actualizar</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 695c27c..4f6a9d4 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -1,586 +1,620 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation>Alarmas</translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Recordatorios</translation>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Alarma en %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation>Ref.cruzadas</translation>
+        <source>Alarms</source>
+        <translation>Alarmas</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Información</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Repetición</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Editor de tarear</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation>silenciosa</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>sonora</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Tareas Opie</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>Nuevo desde plantilla</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Nueva tarea</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>Pulse aquí para crear una nueva tarea.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarea</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>Pulse aquí para modificar la tarea actual.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Ver tarea</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Eliminar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>Pulse aquí para borrar la tarea actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Borrar todo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tareas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar sólo tareas fuera de fecha</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tareas rápida</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Datos</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>EditorRápido</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Este es un listado de todas las tareas actuales:
 
 La lista muestra la siguiente información:
 1. Completada - una marca verde indica tarea finalizada. Pulse aquí para completar una tarea.
 2. Prioridad - una representación gráfica de la prioridad de una tarea. Haga un click doble aquí para modificarla.
 3. Descripción - descripción de la tarea. Pulse aquí para seleccionar la tarea.
 4. Fecha límite - muestra cuando vence una tarea. Esta columna puede mostrarse o esconderse en las opciones del menú.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>No puedo editar datos, estoy sincronizando</translation>
+        <translation type="obsolete">No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>¿todas las tareas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>¿todas las tareas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;Han llegado %1 nuevas tareas.&lt;p&gt;¿Desea añadirlas a su lista de tareas?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuevas tareas</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Editor de plantillas</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Añadir</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Editar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Nueva plantilla %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
+
+Esta área se llama barra rápida de tareas.
+
+Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Introduzca aquí la descripción de la nueva tarea.
+
+Esta área se llama barra rápida de tareas.
+
+Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Más</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Pulse aquí para introducir información adicional en una nueva tarea.
+
+Esta área se llama barra rápida de tareas.
+
+Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Introducir</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Pulse aquí para añadir una nueva tarea.
+
+Esta área se llama barra rápida de tareas.
+
+Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Pulse aquí para reiniciar la información de una nueva tarea.
+
+Esta área se llama barra rápida de tareas.
+
+Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation>Fecha</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Introduzca aquí una breve descripción de la tarea.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Completar </translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En marcha </translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Comprar </translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organizar </translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Conseguir </translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Actualizar </translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Crear </translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planificar </translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Llamar </translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Correo</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Seleccione aquí la prioridad de la tarea.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Seleccione la categoría con la que organizar esta tarea.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarea repetitiva</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Pulse aquí si la tarea ocurre regularmente. Si lo selecciona, la frecuencia puede fijarse en la etiqueta Repetición.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notas:</translation>
+        <translation type="obsolete">Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Introduzca aquí cualquier información adicional sobre esta tarea.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tareas</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Sumario:</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Pulse aquí para fijar el estado actual de esta tarea.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Pospuesta</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Finalizada</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>No iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Seleccione aquí el progreso hecho es esta tarea.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Fecha inicio:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Pulse aquí para fijar la fecha en la que fue empezada esta tarea.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Fecha vencimiento:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea necesita estar completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Pulse aquí para marcar esta tarea como completada.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Pulse aquí para fijar la fecha en la que esta tarea se completó.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Modo mantenedor:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Pulse aquí para fijar el papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Hecho por</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinador</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Este es el nombre del mantenedor actual de la tarea.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Pulse aquí para seleccionar mantenedor de la tarea.</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation>Editor de plantillas</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Añadir</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eliminar</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation>Nueva plantilla %1</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation>Más</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation>Introducir</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
-
-Esta área se llama barra rápida de tareas.
-
-Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Introduzca aquí la descripción de la nueva tarea.
-
-Esta área se llama barra rápida de tareas.
-
-Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Pulse aquí para introducir información adicional en una nueva tarea.
-
-Esta área se llama barra rápida de tareas.
-
-Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Pulse aquí para añadir una nueva tarea.
-
-Esta área se llama barra rápida de tareas.
-
-Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Pulse aquí para reiniciar la información de una nueva tarea.
-
-Esta área se llama barra rápida de tareas.
-
-Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/es/ubrowser.ts b/i18n/es/ubrowser.ts
new file mode 100644
index 0000000..b10a6f5
--- a/dev/null
+++ b/i18n/es/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>- uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - uBrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>¡Error!</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>Dirección IP no encontrada</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Error creando socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Error conectando al socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/usermanager.ts b/i18n/es/usermanager.ts
index 0411777..d121696 100644
--- a/i18n/es/usermanager.ts
+++ b/i18n/es/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Añadir grupo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Editar grupo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
+        <translation type="obsolete">Gestor de Usuarios de Opie</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
         <translation>Gestor de Usuarios de Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Añadir usuario</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Editar usuario</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/wellenreiter.ts b/i18n/es/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/es/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/es/wlansetup.ts b/i18n/es/wlansetup.ts
deleted file mode 100644
index c772dad..0000000
--- a/i18n/es/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation>Configurar LAN inalámbrico</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation>ESS ID</translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation>Non-Spec ESSID: &quot;ANY&quot;</translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation>Specific ESSID</translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation>Tipo de red</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation>Infraestructura</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Canal</translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation>802.11 Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation>Wep</translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation>Configurar clave</translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation>Clave 1</translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation>Clave 2</translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation>Clave 3</translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation>Clave 4</translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation>Longitud clave</translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation>40 Bits</translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation>128 Bits</translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation>Tipo autentificación</translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation>Sistema abierto</translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation>Clave compartida</translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation>Habilitar Wep</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/fr/.directory b/i18n/fr/.directory
index eae1cbf..83d3561 100644
--- a/i18n/fr/.directory
+++ b/i18n/fr/.directory
@@ -1,9 +1,11 @@
 [Desktop Entry]
 Name=French
 Name[da]=Fransk
 Name[es]=Francés
 Name[fr]=Français
 Name[it]=Francese
 Name[pt]=Francês
 Name[pt_BR]=Francês
 Name[sl]=Francoščina
+Name[de]=Französisch
+Name[nl]=Frans
\ No newline at end of file
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 9bddb6a..e5c2580 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -1,955 +1,959 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nom Complet</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Sélectionner</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Chercher</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Ecrire un email à</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Transmettre Entrée</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mes Informations Personnelles</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Edition non autorisée, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer Mes Informations Personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editer Adresse</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Mes Informations Personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Mémoire saturée</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible de sauvegarder
 Libérez de la mémoire
 et réessayez
 
 Quitter ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non Classé</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importer vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fermer Recherche</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Sauver Toutes les Données</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Config</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Non Trouvé</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Fiches</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Fiche</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Démarrer Recherche</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Type Fichier Valide ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
-        <translation>Aucun contact ne correspond
+        <translation type="obsolete">Aucun contact ne correspond
 à cette expression !</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Le fichier selectionné
 ne se termine pas par &quot;.vcf&quot;.
 Voulez-vous vraiment l&apos;ouvrir ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Ajouter Contact ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Voulez-vous vraimment ajouter un contact pour
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Oui pour &amp;Tous</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exporter vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Vous devez sélectionner un contact !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Vous devez rentrer un nom de fichier !</translation>
     </message>
+    <message>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>Aucun contact trouvé correspondant au motif de recherche !</translation>
+    </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Style de Requête</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Utiliser des Expressions Régulières</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Utiliser des Jokers (*, ?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Sensible à la Casse</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Courrier</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Préferer QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Préferer Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Note : QT-Mail est fourni
 dans la ROM par défaut de
 SHARP. Opie-Mail est founi
 gratuitement !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Config. Recherche</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordre</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Ordre des Contacts :</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Cliquez un onglet pour le sélectionner</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Paramètres du type de Recherche</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Si sélectionné, le champ Recherche attend une expression régulière</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Le champ Recherche utilise de simples jokers</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Si sélectionné, la recherche différencie majuscules et minuscules</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Taille des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Paramètres des polices des vues liste et fiche</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utiliser l&apos;application de messagerie de Sharp si disponible</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utiliser Opie-mail si installé</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Déplacer champ sélectionné d&apos;une ligne vers le haut</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Déplacer champ sélectionné d&apos;une ligne vers le bas</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Liste des champs disponibles</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Ajoute champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Supprime le champ sélectionné dans la liste juste au-dessus</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>L&apos;ordre (haut -&gt; bas) définit le premier contact affiché dans la deuxième colonne en mode liste</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Outils/-Barre de Menus</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fixe</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu/-barre d&apos;outils fixe après redémarrage de l&apos;application !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Utiliser un menu-/barre d&apos;outils déplaçable après redémarrage de l&apos;application !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Fichier Sous</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Ville</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Pays</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nom Entier...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notes...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Code postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Etats Unies</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Grande Bretagne</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japon</translation>
     </message>
     <message>
         <source>France</source>
         <translation>France</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Allemagne</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvège</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Entrer Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editer Nom</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanie</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algérie</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>American Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorre</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentine</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australie</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Autriche</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahreïn</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbade</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Biélorussie</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgique</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Bénin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudes</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhoutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Ile Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brésil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarie</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodge</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cap Vert</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Iles Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Tchad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chilie</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Chine</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Iles Christmas</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombie</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comores</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Ile Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croatie</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chypre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>République Tchèque</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danemark</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominique</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>République Dominicaine</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Oriental</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equateur</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypte</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinée Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrée</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonie</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Ethiopie</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Iles Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Iles Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlande</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guyane Française</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polynésie Française</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambie</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgie</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltare</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grèce</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenade</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinée</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyane</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Saint Siège</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hongrie</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islande</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Inde</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésie</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irelande</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italie</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanie</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kénya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Corée</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettonie</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Liban</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lithuanie</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxembourg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macédoine</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaisie</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldives</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malte</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritanie</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Maurice</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexique</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésie</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavie</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolie</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Maroc</translation>
     </message>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 023dafe..ffa5d68 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -1,316 +1,377 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Montrer Fichiers Cachés</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Nouveau Dossier</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Exécuter Commande</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Exécuter Commande et Afficher</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Basculer sur &quot;Local&quot;</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Basculer sur &quot;Distant&quot;</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ce répertoire n&apos;existe pas</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie d&apos;AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Envoie AvancedFM</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Envoie Ir.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de répertoire</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Exécuter</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Ouvrir comme texte</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Créer un lien symbolique</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Déplacer</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Propriétés Fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Définir les Droits</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Envoyer fichier</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier le même Répertoire</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Impossible de copier
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>vers</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Impossible de déplacer</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Ajouter aux Documents</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Tout Sélectioner</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Confirmer la suppression
 du fichier %1 ?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Supprimer Répertoire ?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
-        <translation>Confirmer l&apos;effacement
+        <translation type="obsolete">Confirmer l&apos;effacement
 </translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>Confirmer la copie
 du fichier %1 ?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Le Fichier Existe !</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 exite déjà. Confirmer l&apos;écrasement ?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>Existe déjà.
 Voulez-vous vraiment l&apos;effacer?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 existe déjà. Confirmer son écrasement ?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Impossible de copier %1 vers %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager(new line)
 Copyright 2002-2003 de(new line)
 L.J.Potter&lt;llornkcor@handhelds.org&gt;(new line)
 Sous licence GPL</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!!</source>
-        <translation>Impossible d&apos;effacer le répertoire courant
+        <translation type="obsolete">Impossible d&apos;effacer le répertoire courant
 des favoris.
 Ce n&apos;en est pas un!!</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Répertoire des Favoris</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Effacer le Répertoire Courant des Favoris</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Impossible d&apos;effacer le répertoire courant
+des favoris.
+Ce n&apos;est pas un favoris !</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Rechercher Fichier</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Voulez-vous réellement supprimer %1
+et tout son contenu ?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>Confirmer l&apos;effacement de %1 ?</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sauvegarder la sortie dans un fichier</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Le processus n&apos;a pas pu démarrer</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Erreur
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Terminé
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir les Droits</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir les droits pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autres</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lire</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écrire</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécuter</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Avertissement</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Erreur - aucun utilisateur</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Erreur - aucun group</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Erreur lors du changement de group</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Erreur lors du changement de mode</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index 9c1e8fc..ea1d4ff 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -1,282 +1,286 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>Préférences...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Thème actuel</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editer...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregister</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Forcer le style pour toutes les appilcations.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation>Désactiver le style pour ces applications (&lt;b&gt;*&lt;/b&gt; peut être utilisé comme joker):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>Fichier(s) binaire</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Style des onglets:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Onglets avec icônes</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Liste déroulante</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Liste déroulante avec icônes</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenêtres</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation>Voulez-vous redémarrer %1 maintenant ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Enregister le thème</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Enregistrer le thème</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Le thème existe déjà.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Supprimer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossible de supprimer le thème courant.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nouveau&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Les styles contrôles la manière dont les champs comme les boutons ou les barres d&apos;ascenceurs sont affichés dans toutes les applications.
 
 Cliquez ici pour sélectionner un style disponible.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Cliquez ici pour configurer le style actuellement sélectionné.
 
 Note : Cette option n&apos;est pas disponible pour tous les styles.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Les décorations de fenêtres contrôlent la manière dont les barres de titres et les bouttons des applications apparaissent.
 
 Cliquez ici pour sélectionner une décoration disponible.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Sélectionne le nom, le style et la taille de la police que les applications utiliseront par défaut.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Les thèmes de couleurs sont une collection de couleurs utilisés à différents endroits sur les fenêtres.
 
 Cliquez ici pour sélectionner un thème.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Cliquez ici pour changer les couleurs dans le thème de couleur actuel.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Cliquez ici pour effacer le thème de couleur de la liste.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Cliquez ici pour définir un nom et sauvegarder le thème de couleur actuel.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
         <translation>Cliquez ici pour permettre à toutes les applications d&apos;utiliser les préférences globales d&apos;apparence.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>Si des applications ne s&apos;affichent pas correctement suite aux choix d&apos;apparence globale, vous pouvez désactiver certaines des fonctionnalités pour celle-ci.
 
 Cette partie vous permet de sélectionner une application et de lui attribuer des préférences personnalisées.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
         <translation>Cliquez ici pour ajouter une application à la liste ci-dessous.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
         <translation>Cliquez ici pour effacer l&apos;application sélectionnée.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
         <translation>Cliquez ici pour remonter l&apos;application sélectionnée dans la liste.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
         <translation>Cliquez ici pour descendre l&apos;application sélectionnée dans la liste.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Cliquez ici pour sélectionner le style des fenêtres avec onglet (comme cette application). Les styles disponibles sont:
 
 1. Onglet - Onglets normaux avec des titres texte seulement
 2. Onglet avec icone - Onglets avec icone pour chaque onglet, les titres textes apparaissent seulement sur l&apos;onglet courant
 3. Liste déroulante - Une liste verticale des onglets
 4. Liste déroulante avec icone - Une liste verticale des onglets avec des icones</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Cliquez ici pour que les onglets apparaissent en haut de la fenêtre.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Cliquez ici pour les onglets apparaissent en bas de la fenêtre.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Ceci est un aperçu de la fenêtre. Regardez ici pour voir les changements apportés.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Préferences d&apos;Apparence</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation>Sens de rotation:</translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editer le thème</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Cliquez ici pour sélectionner un couleur pour :</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Exemple</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Control Simple</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Control Désactivé</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Texte Simple</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Texte Surligné</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Bouton</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Case à Cocher</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Fenêtre d&apos;exemple utilisant les nouveaux paramêtres.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index 325db74..6adb193 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -1,522 +1,907 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterDlg</name>
     <message>
         <source>Category Filter</source>
-        <translation>Filtre par catégorie</translation>
+        <translation type="obsolete">Filtre par catégorie</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
+        <translation type="obsolete">&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
         <source>Select groups to show</source>
-        <translation>Sélectionner groupes à afficher</translation>
+        <translation type="obsolete">Sélectionner groupes à afficher</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation>Filtre par catégorie</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation>Sélectionnez un ou plusieurs groupes</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lecture de la configuration...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 <context>
     <name>InstallDlg</name>
     <message>
         <source>Install</source>
-        <translation>Installer</translation>
+        <translation type="obsolete">Installer</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation>Démarrer</translation>
+        <translation type="obsolete">Démarrer</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Options</translation>
+        <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation>Sortie</translation>
+        <translation type="obsolete">Sortie</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>Destination</translation>
+        <translation type="obsolete">Destination</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Espace dispo</translation>
+        <translation type="obsolete">Espace dispo</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
+    <message>
+        <source>Remove
+</source>
+        <translation>Supprimer
+</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation>Installer</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation>Mise-à-jour</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation>(Réinstaller)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation>(Mise-à-jour)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation>Destination</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation>Espace dispo</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation>Sortie</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Démarrer</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Texte</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abandonner</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation>
+** Opération Annuler l&apos;Utilisateur **</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation>** Processus Annulé **</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation>Enregistrer la sortie</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlg</name>
     <message>
         <source>Options</source>
+        <translation type="obsolete">Options</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation type="obsolete">Forcer les Dépendances</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation type="obsolete">Forcer la Réinstallation</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation type="obsolete">Forcer la Suppression</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation type="obsolete">Forcer la Ré-écriture</translation>
+    </message>
+    <message>
+        <source>Verbose WGet</source>
+        <translation type="obsolete">WGet Verbeux</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="obsolete">OK</translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forcer les Dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forcer la Réinstallation</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forcer la Suppression</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forcer la Ré-écriture</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>WGet Verbeux</translation>
+        <source>Information Level</source>
+        <translation>Niveau d&apos;Information</translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>OK</translation>
+        <source>Errors only</source>
+        <translation>Erreurs seulement</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation>Messages Normaux</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation>Messages d&apos;information</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation>Sortie des erreurs</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>Traitement du paquet %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Suppression des liens symboliques...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Creation de liens symboliques pour %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Creation de liens symboliques pour %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Terminé</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Suppression du status...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>fichier status - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>paquet -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Impossible d&apos;ouvrir le fichier de status -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Impossible de créer le fichier de status temporaire -</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>Impossible de démarrer le processus ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>Ouverture impossible de :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Creation répertoire</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Lien %1 sur %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Erreur lors du lien de %1 sur %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>Supprimé : %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Suppression impossible de : %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Supprimé</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Suppression impossible</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation>AQPkg - Gestionnaire de Package</translation>
+        <translation>AQPkg - Gestionnaire de Paquets</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tapez le texte à rechercher ici.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Cliquez ici pour cacher la Barre d&apos;Accès Rapide.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Mettre à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Cliquez ici pour mettre les listes de packages à jour depuis les serveurs.</translation>
+        <translation>Cliquez ici pour mettre les listes de paquets à jour depuis les serveurs.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Mettre à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Cliquez ici pour mettre à jour tous les packages installés si une nouvelle version est disponible.</translation>
+        <translation>Cliquez ici pour mettre à jour tous les paquets installés si une nouvelle version est disponible.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Cliquer ici pour télécharger le(s) package(s) sélectionné(s).</translation>
+        <translation>Cliquer ici pour télécharger le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Appliquer les modifications</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Cliquez ici pour installer, enlever ou mettre à jour le(s) package(s) sélectionné(s).</translation>
+        <translation>Cliquez ici pour installer, enlever ou mettre à jour le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation>Montrer les packages non installés</translation>
+        <translation>Montrer les paquets non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Cliquez ici pour afficher les packages non installés disponibles.</translation>
+        <translation>Cliquez ici pour afficher les paquets non installés disponibles.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation>Afficher les packages installés</translation>
+        <translation>Afficher les paquets installés</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Cliquez ici pour afficher les packages installés sur cet appareil.</translation>
+        <translation>Cliquez ici pour afficher les paquets installés sur cet appareil.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation>Afficher les packages mis à jour</translation>
+        <translation>Afficher les paquets mis à jour</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Cliquez ici pour afficher les packages installés sur cet appareil et dont une version plus récente est disponible.</translation>
+        <translation>Cliquez ici pour afficher les paquets installés sur cet appareil et dont une version plus récente est disponible.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtrer par catégorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation>Cliquez ici pour afficher les packages appartenant à une catégorie.</translation>
+        <translation>Cliquez ici pour afficher les paquets appartenant à une catégorie.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Définir le filtre par catégorie</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation>Cliquez ici pour changer la catégorie de packages à utiliser comme filtre.</translation>
+        <translation>Cliquez ici pour changer la catégorie de paquets à utiliser comme filtre.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Cliquez ici pour rechercher un texte dans les noms de packages.</translation>
+        <translation>Cliquez ici pour rechercher un texte dans les noms de paquets.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Cliquez ici pour trouver le package suivant contenant le texte recherché.</translation>
+        <translation>Cliquez ici pour trouver le paquets suivant contenant le texte recherché.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Clavier d&apos;Accès Rapide</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation>Cliquez ici pour afficher/cacher le clavier permettant le déplacement rapide dans la liste des packages.</translation>
+        <translation>Cliquez ici pour afficher/cacher le clavier permettant le déplacement rapide dans la liste des paquets.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Cliquez ici pour configurer l&apos;application.</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation>Aide</translation>
+        <translation type="obsolete">Aide</translation>
     </message>
     <message>
         <source>Click here for help.</source>
-        <translation>Cliquez ici pour afficher l&apos;aide.</translation>
+        <translation type="obsolete">Cliquez ici pour afficher l&apos;aide.</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>A Propos</translation>
+        <translation type="obsolete">A Propos</translation>
     </message>
     <message>
         <source>Click here for software version information.</source>
-        <translation>Cliquez ici pour les informations sur la version du logiciel.</translation>
+        <translation type="obsolete">Cliquez ici pour les informations sur la version du logiciel.</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Options</translation>
+        <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Cliquez ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveurs :</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Cliquez ici pour sélectionner un serveur de packages.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Packages</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Voici la liste de tous les packages disponibles sur le serveur sélectionné.
 
 Un point bleu signifie que le package est déjà installé sur cet appareil.
 
 Un point bleu avec une étoile signifie que le package est déjà installé, mais que la version du serveur est plus récente.
 
 Cochez la case en début de ligne pour sélectionner un package.</translation>
     </message>
     <message>
         <source>About AQPkg</source>
-        <translation>A propos de AQPkg</translation>
+        <translation type="obsolete">A propos de AQPkg</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation>Cliquez ici pour désinstaller le(s) package(s) sélectionné(s).</translation>
+        <translation>Cliquez ici pour désinstaller le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste du serveur :
 %1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
-        <translation>Construit la liste des packages pour :
+        <translation>Construit la liste des paquets pour :
 %1</translation>
     </message>
     <message>
         <source>Installed To - %1</source>
-        <translation>Installé sur - %1</translation>
+        <translation type="obsolete">Installé sur - %1</translation>
     </message>
     <message>
         <source>Description - %1</source>
-        <translation>Description - %1</translation>
+        <translation type="obsolete">Description - %1</translation>
     </message>
     <message>
         <source>Size - %1</source>
-        <translation>Taille - %1</translation>
+        <translation type="obsolete">Taille - %1</translation>
     </message>
     <message>
         <source>Section - %1</source>
-        <translation>Section - %1</translation>
+        <translation type="obsolete">Section - %1</translation>
     </message>
     <message>
         <source>Filename - %1</source>
-        <translation>Nom - %1</translation>
+        <translation type="obsolete">Nom - %1</translation>
     </message>
     <message>
         <source>V. Installed - %1</source>
-        <translation>V. Installée - %1</translation>
+        <translation type="obsolete">V. Installée - %1</translation>
     </message>
     <message>
         <source>V. Available - %1</source>
-        <translation>V. Disponible - %1</translation>
+        <translation type="obsolete">V. Disponible - %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation>Rafraîchit la liste de packages des serveurs</translation>
+        <translation>Rafraîchit la liste de paquets des serveurs</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENTION : La mise à jour
 lorsque Opie/Qtopia fonctionne
 n&apos;est PAS recommandée !
 
 Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation>Met à jour les packages installés</translation>
+        <translation>Met à jour les paquets installés</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Etes-vous sûr de vouloir effacer
 %1 ?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Télécharger dans</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Entrez la destination du téléchargement</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation>Installer Package Distant</translation>
+        <translation>Installer Paquet Distant</translation>
     </message>
     <message>
         <source>Enter package location</source>
-        <translation>Entrez la chemin du package</translation>
+        <translation>Entrez la chemin du paquet</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Rien à faire</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation>Aucun package sélectionné</translation>
+        <translation>Aucun paquet sélectionné</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Voulez-vous enlever ou réinstaller
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Enlever ou Réinstaller</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Voulez-vous enlever ou mettre à jour
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Enlever ou Mettre à jour</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation>Mise-à-jour du Bureau...</translation>
+    </message>
+</context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation>&lt;b&gt;Description&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Installé Sur&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Taille&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Nom Fichier&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Version Installée&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Version Disponible&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation>Information Paquet</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation>Informations sur le paquet non disponibles</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Paquets installés</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Paquets locaux</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Paquets - %1
+             version - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+            version inst. - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>N° de version indisponible.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Nombre incorrect.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>N° de version terminé par &apos;:&apos; .</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
     </message>
 </context>
 <context>
     <name>SettingsBase</name>
     <message>
         <source>Configuration</source>
-        <translation>Configuration</translation>
+        <translation type="obsolete">Configuration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation>Serveurs</translation>
+        <translation type="obsolete">Serveurs</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation>Serveur actif</translation>
+        <translation type="obsolete">Serveur actif</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation type="obsolete">Nom :</translation>
     </message>
     <message>
         <source>URL:</source>
-        <translation>URL :</translation>
+        <translation type="obsolete">URL :</translation>
     </message>
     <message>
         <source>Change</source>
-        <translation>Changer</translation>
+        <translation type="obsolete">Changer</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Supprimer</translation>
+        <translation type="obsolete">Supprimer</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Nouveau</translation>
+        <translation type="obsolete">Nouveau</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation>Destinations</translation>
+        <translation type="obsolete">Destinations</translation>
     </message>
     <message>
         <source>Link To Root</source>
-        <translation>Créer un lien vers root</translation>
+        <translation type="obsolete">Créer un lien vers root</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation>Proxies</translation>
+        <translation type="obsolete">Proxies</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation>Proxy HTTP</translation>
+        <translation type="obsolete">Proxy HTTP</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Mot de Passe</translation>
+        <translation type="obsolete">Mot de Passe</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation>Activé</translation>
+        <translation type="obsolete">Activé</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation>Proxy FTP</translation>
+        <translation type="obsolete">Proxy FTP</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Utilisateur</translation>
+        <translation type="obsolete">Utilisateur</translation>
     </message>
     <message>
         <source>&amp;Apply</source>
-        <translation>&amp;Appliquer</translation>
+        <translation type="obsolete">&amp;Appliquer</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Général</translation>
+        <translation type="obsolete">Général</translation>
     </message>
     <message>
         <source>(Will take effect on restart)</source>
-        <translation>(Prendra effet après redémarrage)</translation>
+        <translation type="obsolete">(Prendra effet après redémarrage)</translation>
     </message>
     <message>
         <source>Show Jump To Letters</source>
-        <translation>Afficher la Navigation par Lettres</translation>
+        <translation type="obsolete">Afficher la Navigation par Lettres</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation>Serveurs</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation>Destinations</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation>Proxies</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation>Serveur</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Nom :</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Addresse :</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation>Serveur actif</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Mise-à-jour</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation>Destination</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Emplacement :</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation>Lien vers la racine</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation>Proxy HTTP</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Activé</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation>Proxy FTP</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nom Utilisateur :</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Mot de passe :</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/backgammon.ts b/i18n/fr/backgammon.ts
index 4eb9e18..6c5ec70 100644
--- a/i18n/fr/backgammon.ts
+++ b/i18n/fr/backgammon.ts
@@ -1,2 +1,170 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Préférences</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Aide&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Elimine&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Expose&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Protege&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Sécurise&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vide&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Valeurs par défaut</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Aide en Ligne</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Sort les pièces de la endzone</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Elimine une pièce d&apos;un opposant</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Expose vos propres pièces.
+Après un tel choix seul une pièce restera dans la case</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Protège une seule pièce en
+mettant une autre dans la case</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Déplace la pièce sur une case
+déjà occupée par le joueur</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Déplacer une pièce sur une case vide</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Pressez et garder le bouton &apos;?&apos;
+à côté du champs d&apos;aide</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Charger</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Enregister</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Jeu</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Défaut</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Thème</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Joueur</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>AI</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Règles</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>Supprimer thème %1 ?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Charger Thème</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;aucun déplacement&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Joueur 1 gagne. Cliquez pour commencer un nouveau jeu.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Joueur 2 gagne. Cliquez pour commencer un nouveau jeu.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;P2 joue&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;P1 joue&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/backup.ts b/i18n/fr/backup.ts
index 2c6a338..177dd8a 100644
--- a/i18n/fr/backup.ts
+++ b/i18n/fr/backup.ts
@@ -1,53 +1,118 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Sauvegarde et restauration... travail en cours...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Sauvegarde et Restauration</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>Erreur du Système :
+</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>Echec Sauvegarde !</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Détails</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>Sauvegarde et Restauration.. Echec !!</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Sauvegarde Effectuée.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>Veuillez sélectionner un élément à restaurer.</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>Echec de Restauration.</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Impossible d&apos;ouvrir fichier : %1</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>Restauration Effectuée.</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Sauvegarde et Restauration</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sauvegarde</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Enregistrer sous</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sauvegarder</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restauration</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Sélectionner une source</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonne 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurer</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Mise-à-jour Liste des Fichiers</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>Info Erreur</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>Message d&apos;Erreur :</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/bounce.ts b/i18n/fr/bounce.ts
index 6ebf665..e91fa24 100644
--- a/i18n/fr/bounce.ts
+++ b/i18n/fr/bounce.ts
@@ -1,105 +1,129 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Rebond</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nouvelle partie</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;A propos</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>Par&amp;tie</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Score: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Vie: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Rempli: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Temps: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Niveau de Rebond %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Score : %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Jeu en Pause.
 Pressez P pour continuer !</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>Fin de partie !
 Score : %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Temps : %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Vie : %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Rempli : %1</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Rempli : 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Vous avez réussi à nettoyer plus de 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 points : 15 points par vie</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 points : Bonus</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 points : score total</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>Niveau %1.
 Vous avez %2 vies cette fois !</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>A propos</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Ecrit par: Stefan Schimanski
+Porté par: Martin Imobersteg
+
+Cliquez pour construire des murs.
+Espace pour changer la direction d&apos;un mur.
+Essayez de réduire l&apos;espace total de 75%.
+
+Ce programme est distribué sous les
+de la licence GPL v2.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/calibrate.ts b/i18n/fr/calibrate.ts
new file mode 100644
index 0000000..7c73312
--- a/dev/null
+++ b/i18n/fr/calibrate.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Touchez la croix fermement et 
+avec précision pour calibrer l&apos;écran.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Bienvenue sur Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index ab02fd7..dfa5c8a 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,522 +1,526 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de Compte</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nouveau livre</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transactions</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Graphiques</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Entrez le nom du livre de compte ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Sélectionnez le type de livre ici.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Epargne</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Compte chèque</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Liquidités</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Fond de pension</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banque :</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Entrez ici le nom de la banque de ce livre.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>N° compte :</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Entrez ici le n° du compte de ce livre de compte.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>N° PIN :</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Entrez le numéro de PIN pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Solde :</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Entrez le solde initial pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes :</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Entrez les informations supplémentaires pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Solde actuel: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Cette partie affiche le solde courant de ce livre de compte.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Ceci est la liste de toutes les transactions entrées pour ce livre de compte.
 
 Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de la colonne.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Cliquez ici pour ajouter une nouvelle transaction.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Sélectionnez une transaction et cliquez ici pour l&apos;éditer.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Sélectionnez un livre de compte et cliquez ici pour l&apos;effacer.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Sélectionnez le graphique désiré ci-dessous et cliquez sur le boutton Dessiner.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Cliquez ici pour sélectionner le type de graphique désiré.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Solde du compte</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retrait par catégorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Dépôt par catégorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dessiner</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Cliquez ici pour dessiner le graphique sélectionné.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Solde actuel : %1 %2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Supprimer la transaction</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protéger par mot de passe</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Cliquez ici pour activer/désactiver la protection du livre de compte par mot de passe.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer votre mot de passe :</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Veuillez confirmer votre mot de passe :</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe :</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurer &quot;Livre de compte&quot;</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Entrer le symbole de la devise :</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Entrez le symbole de la devise locale ici.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Montrer si le livre de compte est protégé
 par mot de passe</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera si le &quot;livre de compte&quot; est protégé par mot de passe.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Montrer le solde des livres de compte</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera le solde pour chaque livre de compte.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de compte</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Cliquez ici pour créer un nouveau livre de compte.
 
 Vous pouvez aussi sélectionner &quot;Nouveau&quot; à partir du menu de Livre de Compte.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Sélectionnez un livre de compte puis cliquez ici pour l&apos;éditer.
 
 Vous pouvez aussi sélectionner &quot;Éditer&quot; à partir du menu de &quot;Livre de Compte&quot;, ou bien cliquez
 en maintenant appuyé sur le nom d&apos;un livre de compte.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Sélectionnez un livre de compte puis cliquez ici pour le détruire.
 
 Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;Livre de compte&quot;.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Voici une liste de tous les livres de compte disponibles actuellement.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Supprimer un livre de compte</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Cliquez ici pour configurer cette application.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nom du Livre de Compte</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer un mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer un mot de passe :</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaction sur </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Débit</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Sélectionnez ici le type d&apos;opération, débit ou crédit.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Crédit</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Sélectionnez la date de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numéro :</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Entrez le numéro de chèque ici.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description :</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Entrez la description de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Sélectionnez la catégorie de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Sélectionnez le type d&apos;opération ici.
 
 Les options disponibles varient suivant le type d&apos;opération : débit ou crédit.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Montant :</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant de l&apos;opération ici.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Frais :</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant des frais bancaires associés à l&apos;opération.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes :</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Entrez ici les informations complémentaires sur l&apos;opération.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Véhicule</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Factures</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Vêtements</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Ordinateur</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electronique</translation>
+        <translation type="obsolete">Electronique</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Loisirs</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Alimentation</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Carburant</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Cinéma</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Location</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Paiement</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Chèque</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Virement</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carte de crédit</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Professionnel</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Personnel</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Crédit Divers</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Virement automatique</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Liquide</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Electroniques</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index 508e13d..feecf66 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -1,95 +1,99 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Sonner</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Horloge</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Chronomètre</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Mettre à zéro</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Définir l&apos;alarme</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Arréter</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarme Activée</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarme Désactivée</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation>Paramètrer la date et l&apos;heure.</translation>
+        <translation>Paramétrer la date et l&apos;heure.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Horloge: Alarme manquée.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarme fixée : %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Définir Alarme</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Délai avant Sonnerie
 (minutes)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>alarme mp3</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 124dc79..26b4deb 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -1,815 +1,842 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Liste des jours</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durée de l&apos;événement est peut-être plus longue
 que l&apos;intervalle entre les répétitions.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossible d&apos;accéder aux données, synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editer un événement</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minutes)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de mémoire disponible</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>L&apos;application n&apos;a pas été capable de sauver
 vos modifications.
 Libérer de l&apos;espace et réessayer.
 
 Quitter ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(inconnu)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erreur !</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>A modifier</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuer</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Dupliquer évènement</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Éditer...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>boîte d&apos;erreur</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Transmettre</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horaire</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Emettre cet élément</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Après-midi</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 Matin</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Après-midi</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Voir les événements</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Heure de début :</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Paramètres de l&apos;alarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Paramètres par défaut </translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Autre</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Style de lignes :</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyen</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grand</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vues</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vue par défaut :</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semaine</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>List des semaines</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mois</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Aller à l&apos;heure courante</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Affichage de l&apos;heure</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Début-Fin</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMMJVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Sem: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">L</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
-        <translation>J</translation>
+        <translation type="obsolete">J</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">V</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
+        <translation type="obsolete">D</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Répéter...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Quotidien...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Hebdomadaire...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensuel...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annuel...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Heure 
 de début</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Heure 
 de fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nouvel événement</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Rendez-vous</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Déjeuner</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Dîner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Maison</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Heure
 Minutes</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zone
 </translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutes</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencieux</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Fort</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Début - Fin</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notes...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editer la note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 tout</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Tout les %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Les %1 %1 de chaque</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>er</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>ème</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>ème</translation>
     </message>
     <message>
         <source>th</source>
         <translation>ème</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Pas de répétition</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>jour(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Répéter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semaines</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semaine</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source> and </source>
         <translation>et</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 et</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, et</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>activé</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evénement qui se répète</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</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>Tout :</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Fréquence</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fin le :</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 le</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>years</source>
         <translation>années</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/drawpad.ts b/i18n/fr/drawpad.ts
index 2b6ebd6..fa13f5f 100644
--- a/i18n/fr/drawpad.ts
+++ b/i18n/fr/drawpad.ts
@@ -1,441 +1,449 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Supprimer Tout</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importer...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exporter...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Outils</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nouvelle page</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Effacer la page</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Supprimer la page</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Refaire</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Premiere Page</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Page Précédente</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Page Suivante</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Dernière Page</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Dessiner Point</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Dessiner Ligne</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Dessiner Rectangle</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Dessiner Rectangle Plein</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Dessiner Ellipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Desinner Ellipse Pleine</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Remplir Région</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Effacer Point</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Largeur Pinceau</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Couleur Pinceau</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Couleur Remplissage</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Insérer Texte</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vue Miniature</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vue Miniature...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informations Page</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informations Page...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Voulez-vous effacer
 la page actuelle ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Voulez-vous supprimer
 la page actuelle ?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Voulez-vous supprimer
 toutes les pages ?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-crénelage</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Cliquez ici pour ajouter une nouvelle feuille.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Cliquez ici pour effacer la feuille courante.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Cliquez ici pour effacer la feuille courante.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>Cliquez ici pour annuler la dernière action.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>Cliquez ici pour refaire la dernière action.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>Cliquez ici pour voir la première page.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>Cliquez ici pour voir la page précédente.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>Cliquez ici pour voir la  page suivante.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>Cliquez ici pour voir la dernière page.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>Cliquez ici pour sélectionner un outil pour dessiner des lignes.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>Cliquez ici pour sélectionner un outil pour dessiner des rectangles.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>Cliquez ici pour sélectionner un outils pour dessiner des ellipses.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>Cliquez ici pour sélectionner l&apos;outil de texte.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>Cliquez ici pour sélectionner l&apos;outil de remplissage.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>Cliquez ici pour sélectionner la gomme.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>Cliquez ici pour sélectionner la taille du stylo.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>Cliquez ici pour sélectionner la couleur du stylo.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>Cliquez ici pour sélectionner la couleur de remplissage.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>DrawPad - Page %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Sélection Pages</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Toutes</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>En cours</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Plage</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A :</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Exporter sous</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Format :</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>DrawPad - Exporter</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Toutes les Images</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>Aperçu automatique</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Aperçu</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>DrawPad - Importer</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Toutes les images</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nouvelle page</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Couleur de Pinceau</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Couleur de Remplissage</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Informations sur la page</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titre :</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date :</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largeur :</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hauteur :</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Titre : %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Dimensions : %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Date : %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Insérer du texte</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>DrawPad - Vue miniature</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Effacer la Page</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Voulez-vous effacer
 la page sélectionnée ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Supprimer Page</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Voulez-vous supprimer
 la page sélectionnée ?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Cliquez ici pour ajouter une nouvelle feuille.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Cliquez ici pour effacer la feuille courante.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Cliquez ici pour supprimer la feuille courante.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>Cliquez ici pour déplacer la feuille courante vers le début de la liste.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>Cliquez ici pour déplacer la feuille courante à la fin de la liste.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/euroconv.ts b/i18n/fr/euroconv.ts
index 4eb9e18..5f508d1 100644
--- a/i18n/fr/euroconv.ts
+++ b/i18n/fr/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Euroconv</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/formatter.ts b/i18n/fr/formatter.ts
index c6cf873..3f304bd 100644
--- a/i18n/fr/formatter.ts
+++ b/i18n/fr/formatter.ts
@@ -1,174 +1,222 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Type de Support</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Système de Fichiers</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>ATTENTION:
+        <translation type="obsolete">ATTENTION:
 Changer des paramètres sur cette
 page peut rendre votre système
 instable!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>Editer /etc/fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Vérifier le disque</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Point de Montage</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avancé(e)</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Format?!?</translation>
+        <translation type="obsolete">Format?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Réellement formater
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 avec</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>système de fichier?!?
+        <translation type="obsolete">système de fichier?!?
 Vous allez perdre toutes vos données!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Impossible de formater.
 Type inconnu</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Sortie Formateur</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Tentative de démontage.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>Echec du démontage !</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Impossible de démonté.
 Périphérique occupé !</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Tentative de formatage.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Aucun périphérique de ce type !</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 a été formaté correctement.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Tentative de montage.</translation>
+        <translation type="obsolete">Tentative de montage.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Echec du montage !</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 a réussi a être monté. </translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>Vous ne pouvez pas fermer la fenêtre &quot;sortie&quot;.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interne</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Type de Support :</translation>
+        <translation type="obsolete">Type de Support :</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Total : %1 ko ( %d mo)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Utilisé : %1 ko ( %d Mo)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponible : %1 ko ( %d Mo)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>AVERTISSEMENT:
+Changer les paramêtres de
+cette page peut causer un
+disfonctionnement de votre système !</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>Format ?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>
+en %1 ?
+Toutes vos données vont être effacées !!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>Démontage de %1.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>Montage de %1.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%
+a été monté avec succès.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Type du média : %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Type : %1
+Formaté avec %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/helpbrowser.ts b/i18n/fr/helpbrowser.ts
index 001c4d2..850a2e7 100644
--- a/i18n/fr/helpbrowser.ts
+++ b/i18n/fr/helpbrowser.ts
@@ -1,38 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avancer</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Ajouter Signet</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Effacer Signets</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Les Signets</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Naviguer dans l&apos;Aide</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation>Aide - Navigateur</translation>
+        <translation type="obsolete">Aide - Navigateur</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation>Go</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index db1f73c..182a9da 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -1,248 +1,252 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Défauts</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Changer les touches de direction</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Touche non définie</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nouveau</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall of fame</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Quitter</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Cacher Curseur Souris</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selectionner thème graphique</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>Pause en tâche de &amp;Fond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>Continuer en tâche &amp;Active</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Changer les &amp;Touches...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Un jeu pacman pour le bureau KDE 
 
 Le programme est basé sur les source de ksnake
 de Michel Filippi (mfilippi@sade.rhein-main.de).
 Le design est grandement influancé par pacman
 (c) 1980 MIDWAY MFG.CO.
 
 J&apos;aimerais remercier ma copine Elke Krueers pour
 les 10 ans passé dans une ambiance amicale.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Configuration Error</source>
-        <translation>Erreur de configuration</translation>
+        <translation type="obsolete">Erreur de configuration</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
-        <translation>Aucun thème n&apos;est défini,
+        <translation type="obsolete">Aucun thème n&apos;est défini,
 ou auncun thème n&apos;est sélectionné.</translation>
     </message>
+    <message>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
+    </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Le &quot;bitfont&quot; ne peut pas être construit.
 
 Le fichier &apos;@FONTNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>JEU TERMINE</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>JOUEUR UN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRET!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>PERSONNAGE</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>SURNOM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>PORTAGE QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>CLIQUEZ POUR DEMARRER</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MEILLEUR SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FELICITATIONS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>VOUS AVEZ REUSSIT</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>UN SCORE DANS LE TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK SCORE NOM DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>L&apos;image ne peut-être construite.
 
 Le fichier &apos;@PIXMAPNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erreur d&apos;Initialisation</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index b184190..fd78d3d 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -1,209 +1,224 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Paramètres du Bureau</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barre des tâches</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menu O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Afficher ces icônes dans le menu O :</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Afficher les onglets dans le menu O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Choisissez les icônes à afficher dans le menu O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Permet d&apos;afficher le contenu des onglets du bureau dans le menu O.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Exemple 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Exemple 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Exemple 3</translation>
     </message>
 </context>
 <context>
+    <name>SampleView</name>
+    <message>
+        <source>Sample 1</source>
+        <translation type="obsolete">Exemple 1</translation>
+    </message>
+    <message>
+        <source>Sample 2</source>
+        <translation type="obsolete">Exemple 2</translation>
+    </message>
+    <message>
+        <source>Sample 3</source>
+        <translation type="obsolete">Exemple 3</translation>
+    </message>
+</context>
+<context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Editeur d&apos;onglets</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icônes</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Prévisualisation %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Ceci est une prévisualisation grossière de l&apos;apparence qu&apos;aura l&apos;onglet sélectionné.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Personaliser la police</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Strié</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Couleur unie</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Parcourir...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Réglages par défaut</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Taille :</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Couleur :</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Onglets du bureau :</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Afficher le sablier élargi</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Afficher le sablier clignotant</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Sélectionnez l&apos;onglet que vous voulez Editer ou Effacer.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Ajouter un nouvel onglet au bureau.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Ouvrir une boîte de dialogue pour personnaliser l&apos;onglet sélectionné.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Effacer un onglet du bureau.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Activez ceci si vous voulez afficher un gros sablier au milieu de l&apos;écran au lieu de celui qui apparait dans la barre des tâches.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Activez ceci si vous voulez afficher un sablier clignotant quand vous démarrez une application.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Tous les onglets</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Pas encore implanté</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Afficher ces icônes dans la barre des tâches :</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Choisissez les icônes à afficher dans la barre des tâches.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libfreetypefactory.ts b/i18n/fr/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/libfreetypefactory.ts
+++ b/i18n/fr/lib.ts
diff --git a/i18n/fr/libflatstyle.ts b/i18n/fr/libflatstyle.ts
index 4eb9e18..59ed69c 100644
--- a/i18n/fr/libflatstyle.ts
+++ b/i18n/fr/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Sans Relief</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libinterfaces.ts b/i18n/fr/libinterfaces.ts
index 40c8eab..b01b104 100644
--- a/i18n/fr/libinterfaces.ts
+++ b/i18n/fr/libinterfaces.ts
@@ -1,155 +1,163 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Informations Avancées sur l&apos;Interface</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Adresse IP</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Interface</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Masque Sous-réseau</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>Information DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>Serveur DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Expiration du Bail</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Obtension du Bail</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Adresse MAC</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Informations Interface</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Rafraichir</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>S&amp;topper</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>R&amp;e-démarrer</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Démarrer</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Adresse IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Masque Sous-réseau</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>Adresse MAC</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>&amp;Afficher Informations Avancées</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation>&amp;silencieux</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Configuration Interface</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Activer Automatiquement</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Configuration IP Statique</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Masque Sous-réseau</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>DNS Primaire</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Adresse IP</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Passerelle</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>DNS Secondaire</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>Redémarrage de l&apos;interface</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libkppp.ts b/i18n/fr/libkppp.ts
new file mode 100644
index 0000000..7e39284
--- a/dev/null
+++ b/i18n/fr/libkppp.ts
@@ -0,0 +1,1429 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation>Vous permet de modifier le compte sélectionné</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation>Crée un nouveau service de connexion
+à Internet</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation>Effectue une copie du compte sélectionné.
+Toutes les préférences du compte en cours
+sont copiées dans le nouveau compte</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Supprime le compte sélectionné
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;A utiliser avec précaution !&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation>Aucun compte sélectionné.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation>Confirmez vous la suppression du compte
+&quot;%1&quot; ?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Confirmer</translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation>Nouveau Compte</translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation>Editer Compte :</translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation>Composer</translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation>Editer Script de Connexion</translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation>Authentification</translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation>Config IP</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation>Config Passerelle</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Passerelle</translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation>Serveurs DNS</translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation>DNS</translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation>Exécuter Programmes</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Exécuter</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation>Vous devez rentrer un nom de compte unique</translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation>Authentification :</translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation>Script</translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation>PAP</translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation>Terminal</translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation>CHAP</translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation>PAP/CHAP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation>&lt;p&gt;Spécifie la méthode utilisée pour s&apos;identifier auprès
+du serveur PPP. La plus part des universités continuent à
+utiliser l&apos;authentification par &lt;b&gt;Terminal&lt;/b&gt;- ou &lt;b&gt;Script&lt;/b&gt;- alors
+que la plus majorité des fournisseurs d&apos;accès Internet préfèrent
+&lt;b&gt;PAP&lt;/b&gt; ou &lt;b&gt;CHAP&lt;/b&gt;.
+En cas de doute, contactez votre fournisseur.
+
+Si vous pouvez choisir entre PAP et CHAP, choisissez CHAP pour la
+sécurisé qu&apos;il procure. Si vous ne connaissez par la méthode de connexion
+à utiliser, sélectionnez PAP/CHAP.</translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation>Nom Utilisateur :</translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation>Entrez votre nom d&apos;utilisateur (login) ici...</translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation>Mot de Passe :</translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation>Entrez votre mot de passe ici</translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation>Sauver mot de passe</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation>&lt;p&gt;Quand vous activez cette fonctionnalité, le mot
+de passe est sauvegardé dans la config de &lt;i&gt;kppp&lt;/i&gt;
+de façon à ce que vous n&apos;ayez pas à le retaper à
+chaque connexion.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Avertissement :&lt;/font&gt; votre mot de passe sera enregistré en
+claire dans le fichier config (fichier accessible en lecture uniquement par vous).
+Attention à ne pas donner les droits de lecture à d&apos;autres personnes !</translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation>erreur</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation>&lt;qt&gt;Le script de connexion a un boucle sans fin&lt;qt&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Editer...</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation>&amp;Nouveau...</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation>&amp;Copier</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation>&amp;Supprimer</translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation>Nom de domaine :</translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation>Si vous entrez un nom de domain, il sera utilisé par
+votre machine pendant la connexion. Quand la connexion
+est fermée, le nom de domaine par défaut de votre réseau
+est restauré.
+
+Laissez le champs vide pour désactiver cette fonctionnalité.</translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation>Configuration :</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatique</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Manuelle</translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation>Adresse IP DNS :</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Vous permet de spécifier un nouveau serveur DNS
+à utiliser pendant la connexion. Lorsque la connexion est
+fermée, le serveur DNS sera enlever de la liste de ceux à
+utiliser.
+
+Pour ajouter un serveur DNS, entrez son adresse IP ici
+et cliquez sur &lt;b&gt;Ajouter&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation>Cliquez ce bouton pour ajouter l&apos;adresse DNS
+que vous venez de spécifier à la liste si dessous</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Enlever</translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation>Cliquez ce bouton pour enlever le serveur DNS
+sélectionné de la liste des DNS</translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation>Liste des Adresses DNS :</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation>&lt;p&gt;Cette liste montre tous les serveurs DNS à utiliser
+après connexion. Utilisez les boutons &lt;b&gt;Ajouter&lt;/b&gt; et
+&lt;b&gt;Enlever&lt;/b&gt; pour modifier la liste</translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation>Désactiver les serveurs DNS pendant la connexion</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation>Quand cette option est cochée, tous les serveurs DNS
+spécifiés dans &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; sont temporairement
+désactivés (quand la connexion est établie).
+Après fermeture de la connexion, les serveurs sont restaurés.
+
+Cette option n&apos;est pas obligatoire mais peut être intéressante
+dans certaines circonstances.</translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation>Aucun dispositif sélectionné.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation>Confirmez vous la suppression du
+dispositif &quot;%1&quot; ?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Confirmer</translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation>Nouveau Dispositif</translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation>Editer Dispositif :</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation>&amp;Dispositif</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation>&amp;Modem</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation>Vous permet de sélectionner le dispositif</translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation>Créer un nouveau dispositif</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation>Crée un copie du dispositif sélectionné. Tous
+les anciens paramêtres sont copiés. Vous
+pouvez alors modifier la copie en entrant vos
+nouveaux paramêtres</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Détruit le dispositif sélectionné
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;A utiliser avec précaution !&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation>Vous devez utiliser un nom de dispositif unique</translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation>Nom de la Connexion :</translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation>Entrez ici un nom unique pour la connexion</translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation>Numéro de téléphone :</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation>&amp;Ajouter...</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Supprimer</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation>&lt;p&gt;Spécifie le numéro de téléphone à composer.
+Vous pouvez entrer plusieurs numéros en cliquant
+sur &quot;Ajouter&quot;. Vous pouvez réorganiser l&apos;ordre des
+numéros à composer à l&apos;aide des boutons fléchés.
+
+Si un numéro est occupé ou échoue, &lt;i&gt;kppp&lt;/i&gt; essaiera
+de composer le numéro suivant et ainsi de suite</translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation>Personnaliser Arguments pppd...</translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation>Ici, vous pouvez sélectionner les commandes à lancer à certains stades de la connexion. Les commandes sont lancées  avec les permission de votre compte d&apos;utilisateur et donc avez les permissions que l&apos;administrateur vous a donnée (à moins d&apos;être root). &lt;br&gt;&lt;br&gt;Spécifiez le chemin complet des commandes au cas ou elles ne seraient pas trouvées.</translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation>Avant connexion :</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation>Vous permet de lancer un programme &lt;b&gt;avant&lt;/b&gt; la connexion.
+La commande est exécuté avant l&apos;appel.
+
+Il peut-être utile par exemple de fermer un programme de gestion
+de réception de fax qui utiliserait la ligne.</translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation>A la connexion :</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation>Vous permet de lancer un programme &lt;b&gt;après&lt;/b&gt; que la
+connexion soit établie. Quand la commande est lancée, toutes
+la procédure de connexion à Internet est achevée.
+
+Très utile pour lancer le gestionnaire d&apos;E-Mail ou de Nouvelles</translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation>Avant déconnexion :</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation>Vous permet de lancer un programme &lt;b&gt;avant&lt;/b&gt;
+la déconnexion. La connexion reste active tant que le
+programme n&apos;est pas terminé.</translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation>Après déconnexion :</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation>Vous permet de lancer un programme &lt;b&gt;après&lt;/b&gt; que
+la connexion soit fermée.</translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation>Passerelle par défaut</translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation>La connexion PPP à la machine distante est considérée
+comme une passerelle. Toutes les paquets non destiné à
+votre réseau local seront envoyés vers cette machine qui
+se chargera de les re-router.
+
+C&apos;est le paramêtrage par défaut demandé par les fournisseurs
+d&apos;accès Internet.</translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation>Passerelle statique</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation>&lt;p&gt;Vous permet de spécifier la machine que vous désirez utiliser
+ comme passerelle (voir &lt;i&gt;Passerelle par Défaut&lt;/i&gt; ci dessus)</translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation>Adresse IP passerelle :</translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation>Assigne un chemin par défaut à la passerelle</translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation>Cette option active le routage par défaut
+des paquets par la passerelle.
+
+Normalement, vous devez l&apos;activer</translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation>Adresse IP dynamique</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation>Sélectionnez cette option si votre machine reçoit 
+une nouvelle adresse IP à chaque connexion.
+
+La majorité des fournisseurs d&apos;accès à Internet utilisent
+cette méthode.</translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation>Adresse IP statique</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation>Sélectionnez cette option si vous devez utiliser
+une adresse IP fixe. La plus part des ordinateurs
+utilisent les adresses IP alouées dynamiquement.
+Sélectionnez cette option si vous savez ce que vous
+faites.</translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation>Adresse IP :</translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation>Si votre ordinateur a une adresse IP permanente
+vous devez l&apos;entrer ici.</translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation>Masque de sous réseau :</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation>&lt;p&gt;Si votre machine a une adresse IP fixe, vous devez
+définir un masque de sous réseau ici. Dans la majore
+partie des cas, ce masque est &lt;b&gt;255.255.255.0&lt;/b&gt;,
+mais il peut être différent.
+
+Dans le doute, contactez votre fournisseur d&apos;accès</translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation>Configuration auto du nom d&apos;hôte avec cette IP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation>&lt;p&gt;A chaque connexion, cette option reconfigure votre
+nom d&apos;hôte pour répondre à l&apos;adresse IP que votre connexion
+PPP à négocié. Ceci peut-être utile si vous devez utiliser un
+protocole demandant le lien IP / Nom machine.
+
+En générale, cette option est à proscrire pour un accès internet
+à moins de se connecter sur un réseaux d&apos;entreprise.</translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation>Activer cette option peut provoquer des problèmes sur votre serveur X et sur ses clients dès que kppp établie une connexion. 
+Ne l&apos;utilisez pas à moins de savoir ce que vous faites.
+
+Pour plus de renseignement, consulter les FAQs.</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Avertissement</translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation>Pas de mot de passe</translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation>Nom d&apos;utilisateur définit mais par de mot de passe
+Veuillez entrer un mot de passe</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation>&amp;Nom de modem :</translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation>&amp;Device :</translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation>Vous permet de spécifier sur quel port série votre modem
+est attaché. Sous Linux/x86, il s&apos;agit des périfériques
+/dev/ttyS0 (COM1 sous DOS) ou /dev/ttyS1 (COM2 sous DOS).
+
+Si vous utilisez une carte interne ISDN compatible avec les
+commandes AT (la plus part des cartes le sont), vous devrez
+sélectionner /dev/ttyIx (avec x de 0 à 9 en général).</translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation>&amp;Controle de flux :</translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation>Matériels [RTS/CTS]</translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation>Logiciel [XON/XOFF]</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Aucun</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation>&lt;p&gt;Spécifie comment le port série et le modem
+communiquent.
+
+En général, il s&apos;agit du controle de flux matériel RTS/CTS</translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation>&amp;Fin de ligne :</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation>&lt;p&gt;Spécifie la façon dont les commandes AT sont
+envoyées au modem. La plus part des modems ont besoin
+des catactères retour chariot et nouvelle ligne &lt;i&gt;CR/LF&lt;/i&gt;.
+Si votre modem ne réagit par à la chaîne d&apos;initialisation vous
+devriez essayer un autre paramêtrage ici.
+
+&lt;b&gt;Défault&lt;/b&gt;: CR/LF</translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation>&amp;Vitesse de connexion :</translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation>Spécifie la vitesse de communication entre
+le port série de votre appareil et le modem. En
+Général, 115200 bits/sec est la vitesse des modems
+réscents. Essayez une vitesse inférieure en cas de
+problème de communication.</translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation>&amp;Utiliser fichier lock</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Pour prévenir l&apos;accès simultané au modem par
+un autre programme après établissement de la
+connexion, vous pouvez créer un fichier bloquant son
+accès. Sous Linux, un fichier est créé avec pour nom
+par exemple &lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+
+Avec cette option, vous pouvez activer l&apos;utilisation de
+ce type de fichier.
+
+&lt;b&gt;Défault&lt;/b&gt;: Activé</translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation>Délai d&apos;attente :</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>sec</translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation>Spécifies le délai d&apos;attente qu&apos;utilisera &lt;i&gt;kppp&lt;/i&gt;
+pour recevoir la réponse &lt;i&gt;CONNECT&lt;/i&gt; du modem.
+La  valeur recommandée est de 30 secondes.</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation>Attente Tonalité :</translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation>&amp;Attente de la tonalité avant de composer</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Normalement, le modem attent la tonalité de votre
+ligne téléphonique. Cette tonalité indique que vous
+pouvez composer un numéro. Si votre modem ne
+reconnait pas ce son ou que votre système local de
+téléphonie n&apos;en utilise pas, décochez cette option.
+
+&lt;b&gt;Défault:&lt;/b&gt;: Activé</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>sec</translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation>Spécifie le nombre de secondes à attendre avant
+une nouvelle tentative de connexion. Ceci est nécessaire
+pour certains modem qui brûle le numéro si celui-ci ne
+répond pas à plusieurs reprises.
+
+La valeur par défaut est 0.
+</translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation>&amp;Volume modem :</translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation>La plus part des modems ont un haut-parleur.
+Celui-ci peut faire beaucoup de bruit lors des
+tentatives de connexion. Cettte option vous
+permet de le désactiver.
+
+Si ça ne fonctionne pas, vérifiez le changement de
+volume sur le modem ou consultez le manuel.</translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation>Le modem attend la ligne CD</translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation>Contrôle la façon dont &lt;i&gt;kppp&lt;/i&gt; détecte que
+le modem est présent. Si vous n&apos;avez pas de problème
+avec votre modem, ne changez pas ce paramêtre.
+
+&lt;b&gt;Défaut&lt;/b&gt;: Désactivé
+</translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation>&amp;Commandes modems...</translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation>Vous permet de changer les commandes AT à utiliser avec votre modem.</translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation>&amp;Requête modem...</translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation>La plus part des modems accèptent la commande ATI
+qui renvoie des informations sur le modèle du modem.
+
+Cliquez sur ce bouton pour demander au modem
+de vous envoyer ces informations</translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation>Configurer Modem</translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation>Echec modem</translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation>Une erreur critique est survenue lors du test du modem</translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation>&amp;Comptes</translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation>&amp;Dispositifs</translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation>Personnaliser Arguments pppd</translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation>Argument :</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Défauts</translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation>Ajouter Numéro Téléphone</translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation>Entrer un numéro de téléphone :</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation>PPP</translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation>dispositif ppp générique</translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation>Impossible d&apos;accéder au modem.</translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation>Impossible de détecter l&apos;état de la ligne CD.</translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation>Le modem n&apos;est pas prêt.</translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation>Le modem est occupé.</translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation>Modem prêt.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation>Impossible de restaurer les paramêtres tty : tcsetattr()</translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation>Le modem ne répond pas.</translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation>Vitesse inconnue</translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation>Requête ATI</translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation>Impossible de créer le fichier de lock du modem.</translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation>Recherche du modem...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation>Délai requête modem dépassé.</translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation>Le modem est locké.</translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation>Modem prêt</translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation>Veuillez patienter...</translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation>Résultats de la requête modem</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation>Vous n&apos;avez pas la permission de lancer
+une connexion avec kppp. Contactez votre
+administrateur réseau pour plus de détails.</translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation>Impossible de trouver le démon PPP !
+Vérifiez que pppd est installé.</translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation>Vous n&apos;avez pas les permissions pour lancer pppd !
+Contactez votre administrateur réseau pour plus
+d&apos;information.</translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation>Vous n&apos;avez pas les permissions nécessaires au lancement de
+%1
+
+Vérifiez que kppp appartient à root et que le bit SUID est activé.</translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation>%1 n&apos;est pas présent ou ne peut-être lu !
+Demandez à votre administrateur réseau de créer ce fichier (il peut être vide). Il doit avoir les permissions de lecture et d&apos;écriture.</translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation>Editer Commandes Modems</translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation>Pre-init delay (sec/100):</translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation>Initialization string %1:</translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation>Post-init delay (sec/100):</translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation>Dialing speed (sec/100):</translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation>Init response:</translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation>No dial tone detection:</translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation>Dial string:</translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation>Connect response:</translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation>Busy response:</translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation>No carrier response:</translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation>No dial tone response:</translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation>Hangup string:</translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation>Hangup response:</translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation>Answer string:</translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation>Ring response:</translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation>Answer response:</translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation>Escape string:</translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation>Escape response:</translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation>Guard time (sec/50):</translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation>Volume off/low/high:</translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation>Connected at:</translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation>Time connected:</translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation>Volume:</translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation>Session Bill:</translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation>Total Bill:</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation>Disconnect</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation>Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation>KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation>GB</translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation>Connection à : </translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation>En line</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Hors ligne</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation>Connection à :  %1</translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation>Lancement de la commande pre-démarrage...</translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation>Initialisation du modem...</translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation>Préférence</translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation>Paramêtrage du volume modem...</translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation>Désactivation de l&apos;attente tonalité...</translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation>Composition %1</translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation>La ligne et occupé. Attente...</translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation>La ligne et occupé. Attente : %1 secondes</translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation>Pas de Tonalité</translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation>Pas de Porteuse</translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation>Scanne %1</translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation>Sauvegarde de %1</translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation>Envoie de %1</translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation>Attente de %1</translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation>Attente de %1 secondes</translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation>Délai de %1 secondes</translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation>Raccrocher</translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation>Réponse</translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation>ID %1</translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation>Mot de passe %1</translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation>Prompt %1</translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation>PW Prompt %1</translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation>Démarrage Boucle %1</translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation>ERREUR: trop de boucle imbriquées, ignore.</translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation>Le nombre de boucles enchevêtrées est trop grand !</translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation>Fin Boucle %1</translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation>LoopEnd sans Start correspondant ! Ligne : %1</translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation>Lancement de pppd...</translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation>Scanne Var : %1</translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation>Trouvé : %1</translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation>Bouclage : %1</translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation>Délai script dépassé !</translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation>Scanne : %1</translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation>Attendait : %1</translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation>Connexion au réseau...</translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation>Lancement commande début...</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Terminé</translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation>commande pppd + ligne de commande exèdent les 2024 charactères.</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;PPP démon introuvable !&lt;br&gt;Vérifiez que pppd est installé et que le chemin donné est correcte.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation>&lt;qt&gt;Impossible d&apos;exécuter :&lt;br&gt; %1&lt;br&gt;Vérifiez que le bit setuid de pppd est activé.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossible de trouver find:&lt;br&gt; %1&lt;br&gt;Vérifiez que vous avez paramêtré votre modem correctement ou modifiez le port sur lequel vous avez paramêtré votre modem.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Vous avez choisi l&apos;authentification PAP ou CHAP.  Vous devez fournir un nom de connexion et un mot de passe !&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossible de créer fichier d&apos;authentication PAP/CHAP&lt;br&gt;&quot;%1&quot;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation>Vous devez spécifier un numéro de téléphone !</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Insérer</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libmpeg3plugin.ts b/i18n/fr/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/libmpeg3plugin.ts
+++ b/i18n/fr/libmodplugin.ts
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 6cb9a3b..9c79d97 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -1,109 +1,659 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Bouton Agenda</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Bouton Contacts</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Bouton Menu</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Bouton E-Mail</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Bouton Home</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Bouton Enregistrement</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Rotation Ecran</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Haut</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Bas</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Droite</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Gauche</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Maj-Haut</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Maj-Bas</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Maj-Droite</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Maj-Gauche</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Nuance:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Sat :</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Val :</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rouge :</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Vert :</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Bleue :</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Canal Apha :</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Sélectionner Couleur</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Ajouter...</translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Nom :</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Type Mime</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Grande</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Moyenne</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Petite</translation>
+    </message>
+</context>
+<context>
+    <name>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>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
+    </message>
+</context>
+<context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répéter Evènement</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Sans</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>Tous les :</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>Sans</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>Tous</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>A l&apos;Infini</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>jours</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>jour</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>semaines</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>semaine</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>années</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>année</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>et</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>, et</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, et</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>activé</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Pas de Répétition</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>jour(s)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Répéter</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Lu</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Ma</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Me</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Je</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Ve</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sa</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Di</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>semaine(s)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Type Répétition</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Jour</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>mois</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>année(s)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Tous</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Heure :</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Choisir l&apos;Heure :</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation>Documents</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Fichiers</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Tous les Fichiers</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Notes :</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Priorité :</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Très haute</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Haute</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normale</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Faible</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Très Faible</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Etat :</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Délai :</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Catégorie :</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>E-Mail par Défaut :</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Bureau :</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Page Web (bur):</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Téléphone (bur):</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Fax (bur):</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Mobile (bur):</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Radiomessage :</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (perso):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Page Web (bur):</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Téléphone (perso):</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Fax (perso):</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Mobile (perso):</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>EMail(s) :</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Profession :</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Assistant(e) :</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Responsable :</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Homme</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Femme</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>sexe :</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Epouse :</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Date de Naissance :</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Autre Anniversaire :</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Enfant :</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Surnom :</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Lieu :</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Cet événement couvre toute la journée</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Cet événement couvre plusieurs jours</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Début :</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Fin :</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Note :</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Tous</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 chaque</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>Le %1 chaque</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>Le %1 %2 tous les</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Chaque</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Lundi</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Mardi</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Mercredi</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Jeudi</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Vendredi</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Samedi</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Dimanche</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>er</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libopieobex.ts b/i18n/fr/libopieobex.ts
index ff4f790..d7c6b85 100644
--- a/i18n/fr/libopieobex.ts
+++ b/i18n/fr/libopieobex.ts
@@ -1,125 +1,199 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
         <translation type="obsolete">Envoie OBEX</translation>
     </message>
     <message>
         <source>Sending:</source>
         <translation type="obsolete">Envoie :</translation>
     </message>
     <message>
         <source>filename</source>
         <translation type="obsolete">Nom de fichier</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Annuler</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
         <translation type="obsolete">Réception OBEX</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="obsolete">TextLabel1</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="obsolete">Nom de fichier</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
         <translation type="obsolete">Vous avez recu un
 fichier.</translation>
     </message>
     <message>
         <source>Insert</source>
         <translation type="obsolete">Accepter</translation>
     </message>
     <message>
         <source>Reject</source>
         <translation type="obsolete">Refuser</translation>
     </message>
 </context>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recevoir :&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Refuser</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; )Que voulez-vous faire ?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Envoie :&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa non activé !</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Recherche des Dispositifs IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth n&apos;est pas disponible</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Recherche des Dispositifs Bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Préparation de l&apos;envoie.</translation>
+        <translation>Préparation de l&apos;envoi.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>Cliquez pour envoyer</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation>Echéc</translation>
+        <translation>Echec</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Essayer %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Recherche IrDa à nouveau.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation>Début de l&apos;envoie</translation>
+        <translation>Début de l&apos;envoi</translation>
+    </message>
+</context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Recevoir :&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="obsolete">Accepter</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="obsolete">Refuser</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation type="obsolete">&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; )Que voulez-vous faire ?</translation>
+    </message>
+</context>
+<context>
+    <name>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Envoie :&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="obsolete">Terminé</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="obsolete">IrDa non activé !</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="obsolete">Recherche des Dispositifs IrDa.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="obsolete">Bluetooth n&apos;est pas disponible</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="obsolete">Recherche des Dispositifs Bluetooth.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="obsolete">Préparation de l&apos;envoie.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="obsolete">Cliquez pour envoyer</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="obsolete">Envoyé</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="obsolete">Echéc</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="obsolete">Essayer %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="obsolete">Recherche IrDa à nouveau.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="obsolete">Début de l&apos;envoie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 73d0b9b..b047605 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -1,899 +1,992 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classé</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Professionel</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personnel</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nouvelle Catégorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nouvelle Catégorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Ediion des Catégories</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Catégories</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Application</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Les Catégories vont ici</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Cochez les catégories auxquelles ce document appartient.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie ici. Pressez &lt;b&gt;Ajouter&lt;/b&gt; pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Entrez une nouvelle catégorie à gauche et pressez pour l&apos;ajouter à la liste.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Cliquez pour effacer la catégorie surlignée.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Cochez pour rendre cette propriété disponible aux autres applications.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vide</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Désolé, une autre appliation
 est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editer Catégories</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Afficher Janvier dans l&apos;année sélectionnée</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Afficher le mois précédent</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Afficher le mois suivant</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Afficher Décembre dans l&apos;année sélectionnée</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Ferme le sélecteur de fichiers</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Afficher les documents de ce type</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Afficher les documents dans cette catégorie</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Cliquez pour sélectionner un document de cette liste</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, ou sélectionnez &lt;b&gt;Nouveau Document&lt;/b&gt; pour créer un nouveau document.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Cliquez et restez appuyé pour accéder aux propriétés du document.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>La chaîne n&apos;a pas été trouvée.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Fin atteinte, reprise au début</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Trouver</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Trouver : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Débuter la recherche à :</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>01 Dec 02</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Respecter la casse</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Recherche en sens inverse</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vue &quot;Document&quot;</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Echec de l&apos;effacement du fichier.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copie de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Echec de la copie de fichier.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Echec lors du déplacement de fichier.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque Dur</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaire :</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type :</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement :</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Chargement rapide (consomme de la mémoire)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Le média sur lequel le document est placé.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Le nom du document.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Pré-charger cette application pour qu&apos;elle soit disponible instantanément.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Supprimer ce document.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Faire une copie de ce document.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Emettre ce document vers un autre dispositif.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utiliser une rotation personnalisée</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Information du Propriétaire</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrez mot de passe</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de mémoire</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Un problème est survenu lors de la
 création des informations de
 configuration du programme.
 
 Veuillez libérer de la mémoire et 
 ré-essayez.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossible de créer les fichiers de départ
 Veuillez libérer de la mémoire avant
 d&apos;entrer des données</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>J</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Etes-vous sûr de vouloir effacer
+        <translation type="obsolete">Etes-vous sûr de vouloir effacer
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classé</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (bureau)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (Domicile)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adresses de courrier électronique:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Tél (dom):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso):</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (perso):</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur):</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Bureau :</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tél (bur):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (bur):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobile (bur):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Alphapage (bur):</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession :</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant :</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable :</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Genre :</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Epouse :</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Date de naissance :</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversaire :</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Surnom :</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Second Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Fichier Sous</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Fonction</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Département</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Société</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Tél (bur)</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax (bur)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobile (bur)</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email par Défaut</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Tél (dom)</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax (dom)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobile (dom)</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Rue (bur)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Ville (bur)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Région (bur)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Code Postal (bur)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Pays (bur)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Alphapage (bu)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Page Web (bur)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Rue (dom)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Ville (dom)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Etat (dom)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Code Postal (dom)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Pays (dom)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Page Web (dom)</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Epouse</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Genre</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Date de naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Surnom</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Enfants</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nouveau Document</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>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>Jan</source>
+        <translation>Jan</translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation>Fev</translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation>Avr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Aoû</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Oct</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Déc</translation>
+    </message>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Cliquez pour fermer cette fenêtre et abandonner les modifications.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Cliquez pour fermer cette fenêtre.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Cliquez pour fermer cette fenêtre et appliquer les modifications.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Clqiuez pour rendre cette fenêtre déplaçable.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
+    </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Qu&apos;est ce que...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Voulez-vous vraiment supprimer
+%1 ?&lt;/qt&gt;</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+        <translation type="obsolete">&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>Qu&apos;est ce que...</translation>
+        <translation type="obsolete">Qu&apos;est ce que...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Cliquez pour fermer cette fenêtre.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
+        <translation type="obsolete">Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Clqiuez pour rendre cette fenêtre déplaçable.</translation>
+        <translation type="obsolete">Clqiuez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
+        <translation type="obsolete">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disque Dur</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Carte SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disque Dur SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Disque Interne</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Mémoire Interne</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Carte MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Impossible de trouver l&apos;exécutable &quot;citytime&quot;</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Pour choisir le fueau horaire,
 installez &quot;citytime&quot; SVP.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de Mémoire</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichiers</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>tous les %1 fichiers</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index 6feb482..feb2259 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -1,96 +1,96 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Lignes Max:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Définit le maximum de ligne qui devront être affichées pour chaque Date de naissance/Anniversaire</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Couper la ligne après X caractères:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Après combien de caractères doit-être coupé l&apos;information sur la tâche</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Jours en avant :</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Combien de jours pour aller de l&apos;avant</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Pour activer les changement: Redémarrez l&apos;application !</translation>
+        <translation type="obsolete">Pour activer les changement: Redémarrez l&apos;application !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Couleurs des Titres :</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Couleurs des titres !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Couleur des Entrées :</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Cette couleur sera utilisée pour afficher les dates de Naissances/Anniversaire !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Défini Couleur
 d&apos;Urgence</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>
 jours</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Couleur utilisé si l&apos;évènement est proche !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>La Couleur d&apos;Urgence est utilisée si les dates sont plus proches que le nombre défini de jours !</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Module &quot;Répertoire d&apos;Adresse&quot;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochaine date de naissance dans &lt;b&gt; %1 &lt;/b&gt; jours :</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochain anniversaire dans &lt;b&gt;%1&lt;/b&gt; jours :</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>La base de données ne permet pas ce type de recherche ! Mettez à jour libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodaydatebookplugin.ts b/i18n/fr/libtodaydatebookplugin.ts
index c0ca848..b7b298b 100644
--- a/i18n/fr/libtodaydatebookplugin.ts
+++ b/i18n/fr/libtodaydatebookplugin.ts
@@ -1,87 +1,146 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[avec alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>note</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Toute la journée</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>Montrer le lieu</translation>
+        <translation type="obsolete">Montrer le lieu</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Pour afficher le lieu de chaque évènement</translation>
+        <translation type="obsolete">Pour afficher le lieu de chaque évènement</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Montrer les notes</translation>
+        <translation type="obsolete">Montrer les notes</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Pour afficher les notes liées aux évènements</translation>
+        <translation type="obsolete">Pour afficher les notes liées aux évènements</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>Ne montrer que les
+        <translation type="obsolete">Ne montrer que les
 évènements futurs</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Pour n&apos;afficher que les évènements à venir</translation>
+        <translation type="obsolete">Pour n&apos;afficher que les évènements à venir</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>Nombre 
+        <translation type="obsolete">Nombre 
 d&apos;évènements 
 à afficher</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Nombre maximum d&apos;évènements à afficher (par ordre chronologique)</translation>
+        <translation type="obsolete">Nombre maximum d&apos;évènements à afficher (par ordre chronologique)</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>Nombre de jours</translation>
+        <translation type="obsolete">Nombre de jours</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>Nombre de jours prochains pour lesquels afficher les évènements</translation>
+        <translation type="obsolete">Nombre de jours prochains pour lesquels afficher les évènements</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation>jour(s)</translation>
+        <translation type="obsolete">jour(s)</translation>
     </message>
     <message>
         <source>only today</source>
-        <translation>aujourd&apos;hui</translation>
+        <translation type="obsolete">aujourd&apos;hui</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>DatebookPluginConfigBase</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Afficher le lieu</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Pour afficher le lieu de chaque évènement</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Afficher les notes</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Pour afficher les notes liées aux évènements</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Afficher les événements seulement</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Pour n&apos;afficher que les événements à venir</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Afficher l&apos;heure sur une nouvelle ligne</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Nombre maximum d&apos;événements à afficher (par ordre chronologique)</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>Nombre d&apos;événements à afficher ?</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation>seulement aujourd&apos;hui</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Nombre de jours total à afficher</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Nombre de jours</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Module &quot;Agenda&quot;</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Plus d&apos;évènements aujourd&apos;hui</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Pas d&apos;évènements aujourd&apos;hui</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodaytodolistplugin.ts b/i18n/fr/libtodaytodolistplugin.ts
index 88c50e6..e4d9c7e 100644
--- a/i18n/fr/libtodaytodolistplugin.ts
+++ b/i18n/fr/libtodaytodolistplugin.ts
@@ -1,42 +1,61 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Module &quot;Tâches&quot;</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Vous avez &lt;b&gt; 1&lt;/b&gt; tâche active :&lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Vous avez &lt;b&gt; %1&lt;/b&gt; tâches actives : &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Pas de tâche active</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Définit le nombre maximum de tâches à afficher</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>taches affichées</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Définit le nombre de caractères à afficher par ligne pour chaque tâche</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Nombre de caractères par ligne</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>Tâches affichées</translation>
+        <translation type="obsolete">Tâches affichées</translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Définit le nombre maximum de tâches à afficher</translation>
+        <translation type="obsolete">Définit le nombre maximum de tâches à afficher</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Nombre de caractères
+        <translation type="obsolete">Nombre de caractères
 par ligne</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Définit le nombre de caractères à afficher par ligne pour chaque tâche</translation>
+        <translation type="obsolete">Définit le nombre de caractères à afficher par ligne pour chaque tâche</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/librestartapplet.ts b/i18n/fr/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/librestartapplet.ts
+++ b/i18n/fr/libtremorplugin.ts
diff --git a/i18n/fr/libwlan.ts b/i18n/fr/libwlan.ts
new file mode 100644
index 0000000..8b52314
--- a/dev/null
+++ b/i18n/fr/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Conf. Communication Sans Fil</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Spécifier Point d&apos;&amp;Accès</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Spécifier &amp;Canal</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>any</translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation>Infrastructure</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Sécurité</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Activer le Cryptage</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Configurer &amp;Clef</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Clé &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Clé &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Clé &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Clé &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Paquets non-cryptés</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accepter</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Regeter</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Information Interface</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Vitesse</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualité</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Bruit</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libwlanplugin.ts b/i18n/fr/libwlanplugin.ts
new file mode 100644
index 0000000..299fac6
--- a/dev/null
+++ b/i18n/fr/libwlanplugin.ts
@@ -0,0 +1,137 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configuration &quot;sans fils&quot;</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Spécifier le point d&apos;&amp;Accès</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Spcifier le &amp;Canal</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Géré</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>any</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Cryptage</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>Activ&amp;er le cryptage</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Paramètres des &amp;clés</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Clé &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Clé &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Clé &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Clé &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Paquets non cryptés</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accepter</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rejeté</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Information sur l&apos;interface</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Taux</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualité</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Bruit</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/mailit.ts b/i18n/fr/mailit.ts
index 61e3433..062b245 100644
--- a/i18n/fr/mailit.ts
+++ b/i18n/fr/mailit.ts
@@ -1,552 +1,636 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>Joint</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>Type de fichier</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>attach...</source>
         <translation>attache...</translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>Ajout de(s) fichier(s)</translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>Editer Compte</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>Créer Nouveau Compte</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>Nom du Compte</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>Votre Nom</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>Adresse Email</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>Nom Utilisateur POP</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>Mot de passe POP</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>Serveur POP</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>Serveur SMTP</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>Synchroniser</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>Taille Messages (k)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>Inactif</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Messages</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Comptes</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>Recevoir les messages dans</translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>Editer un compte</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>Supprimer un compte</translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation>Envoyer les messages</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>Annuler le tansfert</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Sujet</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>Réception</translation>
     </message>
     <message>
         <source>To</source>
         <translation>A</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>Envoi</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>Pas de compte sélectionné</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>Vous devez créer un compte</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation>Barre d&apos;outils principale</translation>
     </message>
     <message>
         <source>getMail</source>
         <translation>Recevoir Message</translation>
     </message>
     <message>
         <source>select account</source>
         <translation>Sélectionner un compte</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation>Cliquez pour télécharger les messages de tous les comptes.
 Cliquez et gardez la pression pour sélectionner le compte désiré.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation>Aucun compte associé</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation>Aucun compte n&apos;est associé
 à ce courrier
 Il ne peut pas être téléchargé</translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Réponse du serveur de type inconnu&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;hôte non trouvé&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;connexion refusée&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;erreur sur paquet du socket&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Echec de connexion.
+Vérifiez le nom d&apos;utilisateur et le mot de passe&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Erreur de réception </translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>OK
+</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>Impossible de trouver tous 
 les fichiers du message intitulé :</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>Le message n&apos;a pas été envoyé</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>Erreur sur pièce jointe</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>Composer un message</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation>Lire message</translation>
+        <translation type="obsolete">Lire message</translation>
     </message>
     <message>
         <source>Central view area</source>
         <translation>Espace central</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation>Message non téléchargé</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation>Le message cliqué n&apos;a pas
 encore été téléchargé.
 Voulez-vous le faire maintenant ?</translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Mailit</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Lire Message</translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>Connexion établie</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>Une erreur s&apos;est produite</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>Réception en cours</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>Fin du transfert en cours</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>Pas de nouveau message</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>nouveaux messages</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>Pas de nouveau message</translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>Recherche DNS</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation>Le sujet du message doit être placé ici</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation>Les destinataires sont à rentrer ici</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation>Pour envoyé une copie de votre message entrez les autres destinataires ici</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation>Ce bouton ouvre le sélecteur des adresses Emails</translation>
+        <translation type="obsolete">Ce bouton ouvre le sélecteur des adresses Emails</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
         <translation>Entrez le contenu du message ici</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation>Enregistrez votre message dans la file d&apos;attente en cliquant ici</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation>Ceci est une prévisualisation des fichiers attachés du message</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation>Ceci est l&apos;emplacement des messages reçu.
 Après téléchargement, ces messages peuvent être ouvert
 par double click.
 Un icon bleu indique la présence de fichiers attachés.</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation>Ceci est l&apos;emplacement de la liste des messages à envoyer.
 Ces messages peuvent être ouvert par double click avant l&apos;envoie.</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation>Sélectionnez les destinataires ici</translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Ce bouton ouvre le sélecteur d&apos;adresses contenant des E-Mails de Opie addressbook </translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>&amp;Voir</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Message</translation>
     </message>
     <message>
         <source>Previous</source>
         <translation>Précédent</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>Pièces jointes</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>Format texte</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Faire suivre</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation>Cliquez ici pour faire suivre le message sélectionné</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation>Lire le message précédent de la liste</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation>Lire le message suivant de la liste</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation>Cliquez ici pour insérer un ou des fichiers</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation>Deux modes de visualisation des messages :
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; qui affiche les messages avec les enrichissements HTML (pas de retour à la ligne standard)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; qui affiche le message en texte seulement&lt;/LI&gt;Cliquez ici pour basculer d&apos;un mode à l&apos;autre</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation>Cliquez ici pour supprimer le message sélectionné</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation>Cliquez ici pour télécharger le message sélectionné</translation>
     </message>
     <message>
         <source>reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation>Répondre au message</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation>Cliquez ici pour répondre au message sélectionné
 Cliquez et garder la pression pour plus d&apos;options.</translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation>Répondre à tous</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation>Cliquez ici pour répondre à toutes les personnes du message sélectionné</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>Recherche du DNS</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Connection établie</translation>
     </message>
     <message>
         <source>Sending: </source>
-        <translation>Envoyer :</translation>
+        <translation>Envoi :</translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>Envoyé(s)</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>messages</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>Installer</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation>Cliquez ici pour installer les pièces jointes à vos documents</translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Visualiser fichiers attachés</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Attachement</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Installé</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>&amp;Message</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>Mettre en file d&apos;attente</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>Nouveau message</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A :</translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>Cc :</translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>Sujet :</translation>
     </message>
     <message>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation>Attachement</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation>Cliquez ici pour attacher un fichier à votre message</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation>Ce bouton déplace votre message dans la boîte d&apos;envoie</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation>Cliquez ici pour créer un nouveau message</translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation>Pas de destinataire</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation>A qui envoyer le message ?</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation>Séparateur de destinataire incorrecte</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Les destinataires doivent être séparés par ;
 et être des adresses Emails valides</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation>Séparateur des destinataires en copie incorrect</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation>Les destinataires en copie doivent être séparés par ;
 et être des adresses Emails valides</translation>
     </message>
     <message>
         <source>Re: </source>
         <translation>Re :</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation>======Message transféré de </translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation>Début======
 
 </translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation>FWD:</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation>======fin du message transféré========
 
 </translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation>Ecrit sur </translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>E-Mail</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index fccd5b2..1a8adef 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -1,96 +1,189 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Global</source>
-        <translation>Global</translation>
+        <translation type="obsolete">Global</translation>
     </message>
     <message>
         <source>Medium Mount Settings</source>
-        <translation>Options Montage Support</translation>
+        <translation type="obsolete">Options Montage Support</translation>
     </message>
 </context>
 <context>
     <name>MediumGlobalWidget</name>
     <message>
         <source>Enable medium checking</source>
+        <translation type="obsolete">Autoriser Vérification Support</translation>
+    </message>
+    <message>
+        <source>Use global settings</source>
+        <translation type="obsolete">Utiliser les Options Globales</translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation type="obsolete">Quel type de fichiers</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="obsolete">Audio</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Tous</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="obsolete">Image</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Texte</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="obsolete">Vidéo</translation>
+    </message>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="obsolete">Si un support est inséré dans l&apos;appareil, Opie tente une recherche de Documents sur ce support. Sur des supports à grande capacité, cela peut prendre un certain temps. Vous pouvez choisir comment Opie parcourt le support à la recherche de Documents, de manière globale ou par type. Vous pouvez aussi reconfigurer chaque support.</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountSetting::MainWindow</name>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation>Options Montage Support</translation>
+    </message>
+    <message>
+        <source>Global</source>
+        <translation>Global</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Si un support est inséré dans l&apos;appareil, Opie tente une recherche de Documents sur ce support. Sur des supports à grande capacité, cela peut prendre un certain temps. Vous pouvez choisir comment Opie parcourt le support à la recherche de Documents, de manière globale ou par type. Vous pouvez aussi reconfigurer chaque support.</translation>
+    </message>
+    <message>
+        <source>Enable medium checking</source>
         <translation>Autoriser Vérification Support</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Utiliser les Options Globales</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Quel type de fichiers</translation>
+        <translation>Quels fichiers du media</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation>Si un support est inséré dans l&apos;appareil, Opie tente une recherche de Documents sur ce support. Sur des supports à grande capacité, cela peut prendre un certain temps. Vous pouvez choisir comment Opie parcourt le support à la recherche de Documents, de manière globale ou par type. Vous pouvez aussi reconfigurer chaque support.</translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Configurer ce support. Les changements prendront effet lorsque l&apos;application sera fermée. Pour mettre à jour l&apos;Onglet des Documents, vous devez enlever puis réinsérer le support.</translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation>Quel type de fichier</translation>
+        <translation>Quels fichiers du média</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limiter la recherche à :</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Toujours vérifier ce support</translation>
     </message>
+</context>
+<context>
+    <name>MediumMountWidget</name>
+    <message>
+        <source>Which media files</source>
+        <translation type="obsolete">Quel type de fichier</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="obsolete">Audio</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="obsolete">Tous</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation type="obsolete">Image</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="obsolete">Texte</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="obsolete">Vidéo</translation>
+    </message>
+    <message>
+        <source>Limit search to:</source>
+        <translation type="obsolete">Limiter la recherche à :</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="obsolete">Ajouter</translation>
+    </message>
+    <message>
+        <source>Always check this medium</source>
+        <translation type="obsolete">Toujours vérifier ce support</translation>
+    </message>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>Configurer ce support. Les changements prendront effet lorsque l&apos;application sera fermée. Pour mettre à jour l&apos;Onglet des Documents, vous devez enlever puis réinsérer le support.</translation>
+        <translation type="obsolete">Configurer ce support. Les changements prendront effet lorsque l&apos;application sera fermée. Pour mettre à jour l&apos;Onglet des Documents, vous devez enlever puis réinsérer le support.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/networksettings.ts b/i18n/fr/networksettings.ts
index c7dd530..0693dad 100644
--- a/i18n/fr/networksettings.ts
+++ b/i18n/fr/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>Ajouter une connexion réseau</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>A&amp;nnuler</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Services</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Paramètres Réseau</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Connexions</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>in</source>
         <translation>dans</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Information</translation>
+        <translation type="obsolete">&amp;Information</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Configurer</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Enlever</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Profils</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation>Par &amp;Défaut</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Profil par défaut</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nouveau Profil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Une liste de &apos;paramêtre de réseau&apos; sélectionnable</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Ajouter une nouvelle interface à la liste.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Démarrer/Arrêter</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Démarre et arrête l&apos;interface courante et en donne des informations utiles.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configure l&apos;interface courante</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Supprimer de la liste l&apos;interface courante.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Déconnecté</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Impossible de supprimer.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Désolé</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Veuillez sélectionner une interface.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/odict.ts b/i18n/fr/odict.ts
index fd081d1..ba46d20 100644
--- a/i18n/fr/odict.ts
+++ b/i18n/fr/odict.ts
@@ -1,128 +1,160 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Méthode de recherche</translation>
     </message>
     <message>
         <source>General Settings</source>
-        <translation>Config. Générale</translation>
+        <translation type="obsolete">Config. Générale</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation>Méthodes de recherche</translation>
+        <translation type="obsolete">Méthodes de recherche</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Modifier</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>OPIE-Dictionnaire</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Requête :</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>Config</translation>
+        <translation type="obsolete">Config</translation>
     </message>
     <message>
         <source>Searchmethods</source>
         <translation>Méthodes de recherche</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation>Respecter la C&amp;asse</translation>
     </message>
     <message>
         <source>Only &amp;complete Words</source>
-        <translation>Les Mots c&amp;omplets seulement</translation>
+        <translation type="obsolete">Les Mots c&amp;omplets seulement</translation>
     </message>
     <message>
         <source>Allow &amp;reg. expressions</source>
-        <translation>Inclure les expressions en&amp;registrées</translation>
+        <translation type="obsolete">Inclure les expressions en&amp;registrées</translation>
     </message>
     <message>
         <source>0 Errors</source>
-        <translation>0 Erreur</translation>
+        <translation type="obsolete">0 Erreur</translation>
     </message>
     <message>
         <source>1 Errors</source>
-        <translation>1 Erreur</translation>
+        <translation type="obsolete">1 Erreur</translation>
     </message>
     <message>
         <source>2 Errors</source>
-        <translation>2 Erreurs</translation>
+        <translation type="obsolete">2 Erreurs</translation>
     </message>
     <message>
         <source>3 Errors</source>
-        <translation>3 Erreurs</translation>
+        <translation type="obsolete">3 Erreurs</translation>
     </message>
     <message>
         <source>4 Errors</source>
-        <translation>4 Erreurs</translation>
+        <translation type="obsolete">4 Erreurs</translation>
     </message>
     <message>
         <source>Until Hit</source>
-        <translation>Jusqu&apos;au bout</translation>
+        <translation type="obsolete">Jusqu&apos;au bout</translation>
     </message>
     <message>
         <source>&amp;Error tolerance</source>
-        <translation>Tolérance d&apos;&amp;Erreur</translation>
+        <translation type="obsolete">Tolérance d&apos;&amp;Erreur</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Paramêtre</translation>
     </message>
+    <message>
+        <source>Opie-Dictionary</source>
+        <translation>Opie-Dictionary</translation>
+    </message>
+    <message>
+        <source>No dictionary defined</source>
+        <translation>Aucun dictionnaire défini</translation>
+    </message>
+    <message>
+        <source>&amp;Define one</source>
+        <translation>&amp;En Définir Un</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuler</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>Fichier Dictionnaire</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Explorer</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>Langage 1</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>Decollator</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>Langage 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>Nouvelle méthode de recherche</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>Changer la méthode de recherche</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opie-console.ts b/i18n/fr/opie-console.ts
index 7e9ee2e..e03ae63 100644
--- a/i18n/fr/opie-console.ts
+++ b/i18n/fr/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation>Config. des Paramêtres d&apos;appel</translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation>Config. 1</translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation>Config. 2</translation>
     </message>
     <message>
         <source>Init string </source>
         <translation>Chaîne d&apos;initialisation</translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation>Chaîne de re-initialisation</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation>Préfixe d&apos;appel #1</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation>Sufixe d&apos;appel #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation>Préfixe d&apos;appel #2</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation>Préfixe d&apos;appel #2</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation>Préfixe d&apos;appel #3</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation>Sufixe d&apos;appel #3</translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation>Chaîne de connexion</translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation>Chaîne pour raccrocher</translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation>Temps d&apos;appel</translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation>Delai avant rappel</translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation>Nombre de tentatives</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation>Durée de tombé de DTR (0=non)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation>Sélection automatique des bps</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation>Le modem utilise DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation>Multi-line untag</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositif</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation>Ou scruter les adresses mac</translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>Editer Profile Connexion</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Nouvelle Connexion</translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation>Nom du profile</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Ajouter</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editer</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Supprimer</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation>Commande à exécuter</translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation>Variables d&apos;Environnement</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Value</source>
         <translation>Valeur</translation>
     </message>
     <message>
         <source>Name :</source>
         <translation>Nom :</translation>
     </message>
     <message>
         <source>Value :</source>
         <translation>Valeur :</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation>Entrez un numéro</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation>Entrez le numéro à composer. Cliquez ok pour valider</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation>Editeur</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation>Emulation de Terminal :</translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation>Gestionnaire d&apos;Entrée/Sortie :</translation>
     </message>
     <message>
         <source>Look</source>
         <translation>Apparence</translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation>Premier plan :</translation>
     </message>
     <message>
         <source>Black</source>
         <translation>Noir</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Blanc</translation>
     </message>
     <message>
         <source>Gray</source>
         <translation>Gris</translation>
     </message>
     <message>
         <source>Background:</source>
         <translation>Arrière plan :</translation>
     </message>
     <message>
         <source>Font:</source>
         <translation>Fonte :</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petit</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Moyen</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation>Ne peut commencer</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation>Erreur lors du fork</translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation>Ne peut commencer</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation>Dimensions</translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation>Editer la clef</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation>Vitesse</translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation>Control de flux</translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation>Matériel</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Logiciel</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Parité</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Impaire</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Paire</translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation>Bits</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation>Bits de Stop</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
         <translation>1,5</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation>115200 baud</translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation>57600 baud</translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation>38400 baud</translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation>19200 baud</translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation>Non connecté</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation>Vitesse en bauds invalide</translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation>Dispositif déjà connecté</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositif</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configurer les Profiles</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nouvelle Connexion</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Sauver Connection</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connecter</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Déconnecter</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>Lancement Rapide</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>Le buton shell lance le profile par &quot;défaut&quot;. Si non présent, les valeurs sont demandées</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transfer du fichier...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Retour à la ligne</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Sauver l&apos;historique</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminer</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Fermer la Fenêtre</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>Lancer Script</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>Enregistrer Script</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>Sauver Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Ouvrir le Clavier...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Nouveau Profile Identique</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Aucune Connexion disponible.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Historique</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nouveau Profile</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation>Enregister Profile</translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>Modem attaché à :</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>Entrer le numéro de téléphone ici :</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>Commandes AT</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>Enter le numéro</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>Ce module n&apos;est pas configurable</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>Connexion auto. après chargement</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console locale</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nouveau Profile</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>Console Opie</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>La connexion a échoué cette fois-ci.</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>Echec de la session</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Ne peut ouvrir la session: tous les composants non pas pu être trouvé.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>Mode de Transfère</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Recevoir</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Envoyer fichier</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocole de Transfère</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progression</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Prêt</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Commencer le transfère</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transfère fichier</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Attention</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>Aucun fichier spécifié.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>Envoie...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>Réception...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Abandonné</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>Le transfère du fichier a été abandonné.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>Opération non supportée.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>Le transfère n&apos;a pas pu commencer.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Aucune erreur.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>Une erreur inconnue est survenue.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transfère incomplet.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Erreur inconnue.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Envoyé</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>Le fichier a été envoyé.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Reçu</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>Le fichier a été reçu.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nom de profile</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Profile</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Touches Spéciales</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Profile invalide</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>Veuillez entrer un nom de profile.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Série</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Console Locale</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminale par défaut</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Clavier par Défaut</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation>Fichier Synchronisé</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numéro appélé : %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation>La numérotation du numéro a échouée.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation>Annulation...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Recherche du modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Initialisation...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation>Reinitialisation du haut-parleurs</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>Inactivation du son de numérotation</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Numéro composé</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Ligne occupée, rappel du numéro</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Connexion établie</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>Rejeté</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositif</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Type de Terminale</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Combinaison de couleur</translation>
     </message>
     <message>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
         <source>small</source>
         <translation>petite</translation>
     </message>
     <message>
         <source>medium</source>
         <translation>moyenne</translation>
     </message>
     <message>
         <source>large</source>
         <translation>large</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation>Conversions des retours chariots</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Limite interne</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Limite externe</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Echo local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Retour à la ligne</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Console Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>X-Terminale</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>noir sur blanc</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>blanc sur noir</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>vert sur noir</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>orange sur noir</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opie-login.ts b/i18n/fr/opie-login.ts
index b404543..8378bdc 100644
--- a/i18n/fr/opie-login.ts
+++ b/i18n/fr/opie-login.ts
@@ -1,87 +1,100 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez et gardez la pression sur croix pour calibrer votre écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenue sur Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspendre</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Mauvais mot de passe</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Le mot de passe est incorrect.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>Opie s&apos;est terminé
+        <translation type="obsolete">Opie s&apos;est terminé
 par un signal &quot;uncaught
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>Impossible de démarrer Opie.</translation>
+        <translation type="obsolete">Impossible de démarrer Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Impossible de changer d&apos;utilisateur</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>Opie a été terminé par un
+signal non pris en charge
+(%1)</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>Impossible de démarrer Opie.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieftp.ts b/i18n/fr/opieftp.ts
index 559e828..9d41498 100644
--- a/i18n/fr/opieftp.ts
+++ b/i18n/fr/opieftp.ts
@@ -1,251 +1,251 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Distant</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Se connecter</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Se déconnecter</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Montrer Fichiers Cachés</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Créer Répertoire</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Télécharger</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Basculer sur Local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Basculer sur Distant</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Basculer sur la Config</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Rép</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Nom Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Serveur distant</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Chemin distant</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Veuillez définir les paramêtres du serveur distant</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Impossible de se connecter à
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Impossible de se &quot;loguer&quot; à 
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Impossible d&apos;envoyer
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Impossible d&apos;envoyer les répertoires</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Impossible de télécharger
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Impossible de lister le répertoire</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Impossible de changer de répertoire
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Impossible de remonter</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Impossible d&apos;obtenir le rép de travail
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Changer de Répertoire</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Voulez-vous réellement effacer
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Il doit être vide</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Impossible de créer un répertoire</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Impossible de supprimer le répertoire
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Impossible de supprimer le fichier
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Impossible de renomer le fichier
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renomer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ce répertoire n&apos;existe pas</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>A propos</translation>
+        <translation type="obsolete">A propos</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nouveau Nom de Serveur</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Désolé, nom déjà utilisé</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieirc.ts b/i18n/fr/opieirc.ts
index 27a47fe..88d0c26 100644
--- a/i18n/fr/opieirc.ts
+++ b/i18n/fr/opieirc.ts
@@ -1,512 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>Discussion sur le canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Canal de discution</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Entrez votre message ici pour participer au canal de discution</translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>Requête</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>Connecté, enregistrement ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>Enregistrement réussi.</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>Erreur de socket :</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Connexion fermée</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation>Commande numérique reçu non supporté :</translation>
+        <translation type="obsolete">Commande numérique reçu non supporté :</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation>Commande ctcp reçu non supporté :</translation>
+        <translation type="obsolete">Commande ctcp reçu non supporté :</translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation>Commande littérale reçu non supporté :</translation>
+        <translation type="obsolete">Commande littérale reçu non supporté :</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Accès à un canal non-existant - Désynchronisé ?</translation>
     </message>
     <message>
         <source> joined channel </source>
-        <translation>canal joint</translation>
+        <translation type="obsolete">canal joint</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Cette personne a déjà joint le canal - Désynchronisé ?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Vous êtes déjà inscrit sur ce canal - Désynchronisé ?</translation>
     </message>
     <message>
         <source>You left channel </source>
-        <translation>Vous avez quitté le canal</translation>
+        <translation type="obsolete">Vous avez quitté le canal</translation>
     </message>
     <message>
         <source> left channel </source>
-        <translation>canal quitté</translation>
+        <translation type="obsolete">canal quitté</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Personne en appartée non trouvée - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Canal à par non trouvé - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Canal message avec expéditeur inconnu</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
-        <translation>Canal message avec canal inconnu</translation>
+        <translation type="obsolete">Canal message avec canal inconnu</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Message PRIVMSG reçu de type inconnu</translation>
     </message>
     <message>
         <source>You are now known as </source>
-        <translation>Vous êtes actuellement référencé comme</translation>
+        <translation type="obsolete">Vous êtes actuellement référencé comme</translation>
     </message>
     <message>
         <source> is now known as </source>
-        <translation>est référencé comme</translation>
+        <translation type="obsolete">est référencé comme</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>Surnom d&apos;une personne inconnu changé </translation>
     </message>
     <message>
         <source> has quit </source>
-        <translation>a quitté</translation>
+        <translation type="obsolete">a quitté</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Personne inconnu a quitté - Désynchronisé ?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>sujet remplacé par</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Sujet du canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Reçu CTCP PING de</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation>Reçu CTPC VERSION de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;une personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION à bénéficiaire incorrect</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>Changement de mode de type inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>Changement de mode avec personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>Changement de mode avec drapeau inconnu</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>Changement de mode sur canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>Modes utilisateur non encore supportés</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>Vous avez été éjecté de</translation>
     </message>
     <message>
         <source> by </source>
         <translation>par</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>éjecté de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>Message d&apos;éjection d&apos;un inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>Ejection d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>Serveur de message avec canal inconnu</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>Vous avez joint le canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>Surnom déjà utilisé, connectez vous sous un autre surnom</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>Surnom inexistant</translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Commande numérique non supportée reçu : %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Commande ctcp non supportée reçu : %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Commande literale non supportée reçu : %1</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>%1 a join le canal %2</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>Vous avez quitté le canal %1</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>%1 a quitté le canal %2</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>Message avec numéro de Canal  %1 inconnu</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>Vous êtes enregistrés en tant que %1</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 est maintenant %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 a quitté (%2)</translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>Discution avec</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>Discussion privée</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>Entrez votre message ici pour pouvoir l&apos;envoyer à l&apos;autre personne</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Déconnecté</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>Nom profile :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>Le nom du serveur de profile dans la vue d&apos;ensemble</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>Nom d&apos;hôte :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>Le serveur à joindre peut être un nom d&apos;hôte ou une adresse IP</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>Port :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>Port du serveur à joindre. Usuellement 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>Surnom :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>Votre surnom sur le réseau IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>Nom Réel :</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>Votre vrai nom</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>Mot de passe de connexion au serveur (si nécessaire)</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>Canaux :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>Liste des canaux que vous voulez joindre automatiquement séparés par des virgules</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>Editer les infomations du serveur</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nom de profile nécessaire</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nom d&apos;hote nécessaire</translation>
     </message>
     <message>
         <source>Port required</source>
         <translation>Port nécessaire</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>Surnom nécessaire</translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation>Nom réel nécessaire</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La liste des canaux nécessite que
 les noms de canaux soient séparés
 par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>Liste des Serveurs</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>Veuillez choisir un profile de serveur</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>Sélectionnez dans la liste un profile de serveur et validez votre choix</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>Détruire le profile du serveur sélectionné</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editer le profile du serveur séléctionné</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Ajouter un nouveau profile de serveur</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation>Connexion à</translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation>Messages serveur</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Entrez les commandes ici. La liste des commandes disponiblent est répertorié dans l&apos;aide</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>Lignes affichées :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>Nombre de lignes à afficher lors des discussions avec qu&apos;elles soient détruites - ceci est nécessaire pour limiter l&apos;espace mémoire qu&apos;elles occupent. Mettre 0 si vous ne voulez pas de limitation</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Générale</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>Couleur d&apos;arrière plan :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>Couleur d&apos;arrière plan utilisée lors des discutions</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>Couleur du texte simple :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>Couleur du texte utilisée lors des discussions</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>Couleur d&apos;erreur :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>Couleur du texte utilisée par les erreurs</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>Couleur de votre texte :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>Couleur du texte identifiant les messages que vous envoyez</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>Couleur du texte des autres :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>Couleur du texte identifiant les messages des autres</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>Couleur du texte du serveur :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>Couleur du texte identifiant les messages du serveur</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>Notifications :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>Couleur du texte utilisée par les notifications</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation>Préférences</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>Description manquante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>Description contenu onglet</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>Fermer cet onglet</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>Connexions serveur, canaux, requêtes et autres sont placés ici</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>Nouvelle connexion</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>Créer une nouvelle connexion à un serveur IRC</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>Configurer les options et l&apos;apparence d&apos;OpieIRC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opierec.ts b/i18n/fr/opierec.ts
new file mode 100644
index 0000000..3575ac1
--- a/dev/null
+++ b/i18n/fr/opierec.ts
@@ -0,0 +1,212 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avancer</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>OpieRecord</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Heure</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Fichiers</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation>Echantillonage</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>Limite de Taille</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Sans limite</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>Répertoire Fichier</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>Profond. Bit</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Out</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>Espace Disque Insuffisant</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>Vous avez plus assez
+de place sur le disque ou
+votre carte n&apos;est pas reconnue</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>seconds</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>Confirmez vous &lt;font size=+2&gt;&lt;B&gt;la suppression&lt;/B&gt;&lt;/font&gt;
+des fichiers sélectionnés ?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Oui</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Non</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>Impossible de supprimer le fichier.</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>Opierec</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>Veuillez sélectionner un fichier à jouer</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Note</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>Impossible d&apos;ouvrir le fichier audio.
+</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Jouer</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>Emettre par IrDa</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Renommer</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>Ir Emission</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>Ir envoyé.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>Rec</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Emplacement</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>Compression (fichiers plus petits)</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>Silence auto </translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>Silence</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Stopper</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/osearch.ts b/i18n/fr/osearch.ts
new file mode 100644
index 0000000..fef9e46
--- a/dev/null
+++ b/i18n/fr/osearch.ts
@@ -0,0 +1,124 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>OSearch</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Les détails du résulat courant</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Applications</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documents</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Tâches</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Calendrier</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Répertoire</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Rechercher</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Rechecher tous</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Sensible à la casse</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Utiliser les jokers</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Entrez les termes recherchés ici</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Résultats</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show completed tasks</source>
+        <translation>Montrer les tâches terminées</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>Montrer les évènements passés</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>Recherche dates</translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation>montrer</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>editer</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>Executer</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>Ouvrir dans le gestionnaire de fichiers</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Fichier:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Lien:</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>type MIME:</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>Ouvrir avec</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>Rechercher contenu</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>recherche de %1 en cours</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 7feadb5..94d4a97 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -1,571 +1,1007 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calculer</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Form1</source>
-        <translation>Form1</translation>
+        <translation type="obsolete">Form1</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Masse Molaire</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formule Chimique</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Masse Molaire (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composition Elementaire (%) :</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation>Masse :</translation>
+        <translation type="obsolete">Masse :</translation>
     </message>
     <message>
         <source>Block</source>
         <translation>Famille</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronégativité</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Rayon atomique</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energie d&apos;ionisation</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densité</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Point d&apos;ébullition</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Point de fusion</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>Tableau</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Données</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calculs</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>Tableau Périodique</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>ERREUR :
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Données Chimiques</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hydrogène</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Hellium</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Béryllium</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Bore</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbone</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Azote</translation>
     </message>
     <message>
-        <source>Oxygen</source>
-        <translation>Oxygène</translation>
-    </message>
-    <message>
         <source>Fluorine</source>
         <translation>Fluore</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Néon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodium</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnésium</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Aluminum</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Phosphore</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Soufre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Chlore</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potassium</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titane</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Chrome</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganèse</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Fer</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nickel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cuivre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinc</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsenique</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Sélénium</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Brome</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molybdène</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Technitium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Ruthénium</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rhodium</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Argent</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Etain</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimoine</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellure</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iode</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xénon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césium</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lanthane</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cérium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praséodyme</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Néodyme</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Prométhium</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutétium</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantale</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsten</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Rhénium</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platine</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Or</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercure</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Plomb</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuth</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astate</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Thorium</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protactinium</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranium</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Neptunium</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonium</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Américium</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curium</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkélium</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californium</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendélévium</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobélium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerium</translation>
     </message>
 </context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Tableau Périodique</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>ERREUR :
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Données Chimiques</translation>
+    </message>
+    <message>
+        <source>Hydrogen</source>
+        <translation type="obsolete">Hydrogène</translation>
+    </message>
+    <message>
+        <source>Helium</source>
+        <translation type="obsolete">Hellium</translation>
+    </message>
+    <message>
+        <source>Lithium</source>
+        <translation type="obsolete">Lithium</translation>
+    </message>
+    <message>
+        <source>Beryllium</source>
+        <translation type="obsolete">Béryllium</translation>
+    </message>
+    <message>
+        <source>Boron</source>
+        <translation type="obsolete">Bore</translation>
+    </message>
+    <message>
+        <source>Carbon</source>
+        <translation type="obsolete">Carbone</translation>
+    </message>
+    <message>
+        <source>Nitrogen</source>
+        <translation type="obsolete">Azote</translation>
+    </message>
+    <message>
+        <source>Oxygen</source>
+        <translation type="obsolete">Oxygène</translation>
+    </message>
+    <message>
+        <source>Fluorine</source>
+        <translation type="obsolete">Fluore</translation>
+    </message>
+    <message>
+        <source>Neon</source>
+        <translation type="obsolete">Néon</translation>
+    </message>
+    <message>
+        <source>Sodium</source>
+        <translation type="obsolete">Sodium</translation>
+    </message>
+    <message>
+        <source>Magnesium</source>
+        <translation type="obsolete">Magnésium</translation>
+    </message>
+    <message>
+        <source>Aluminum</source>
+        <translation type="obsolete">Aluminum</translation>
+    </message>
+    <message>
+        <source>Silicon</source>
+        <translation type="obsolete">Silicium</translation>
+    </message>
+    <message>
+        <source>Phosphorus</source>
+        <translation type="obsolete">Phosphore</translation>
+    </message>
+    <message>
+        <source>Sulfur</source>
+        <translation type="obsolete">Soufre</translation>
+    </message>
+    <message>
+        <source>Chlorine</source>
+        <translation type="obsolete">Chlore</translation>
+    </message>
+    <message>
+        <source>Argon</source>
+        <translation type="obsolete">Argon</translation>
+    </message>
+    <message>
+        <source>Potassium</source>
+        <translation type="obsolete">Potassium</translation>
+    </message>
+    <message>
+        <source>Calcium</source>
+        <translation type="obsolete">Calcium</translation>
+    </message>
+    <message>
+        <source>Scandium</source>
+        <translation type="obsolete">Scandium</translation>
+    </message>
+    <message>
+        <source>Titanium</source>
+        <translation type="obsolete">Titane</translation>
+    </message>
+    <message>
+        <source>Vanadium</source>
+        <translation type="obsolete">Vanadium</translation>
+    </message>
+    <message>
+        <source>Chromium</source>
+        <translation type="obsolete">Chrome</translation>
+    </message>
+    <message>
+        <source>Manganese</source>
+        <translation type="obsolete">Manganèse</translation>
+    </message>
+    <message>
+        <source>Iron</source>
+        <translation type="obsolete">Fer</translation>
+    </message>
+    <message>
+        <source>Cobalt</source>
+        <translation type="obsolete">Cobalt</translation>
+    </message>
+    <message>
+        <source>Nickel</source>
+        <translation type="obsolete">Nickel</translation>
+    </message>
+    <message>
+        <source>Copper</source>
+        <translation type="obsolete">Cuivre</translation>
+    </message>
+    <message>
+        <source>Zinc</source>
+        <translation type="obsolete">Zinc</translation>
+    </message>
+    <message>
+        <source>Gallium</source>
+        <translation type="obsolete">Gallium</translation>
+    </message>
+    <message>
+        <source>Germanium</source>
+        <translation type="obsolete">Germanium</translation>
+    </message>
+    <message>
+        <source>Arsenic</source>
+        <translation type="obsolete">Arsenique</translation>
+    </message>
+    <message>
+        <source>Selenium</source>
+        <translation type="obsolete">Sélénium</translation>
+    </message>
+    <message>
+        <source>Bromine</source>
+        <translation type="obsolete">Brome</translation>
+    </message>
+    <message>
+        <source>Krypton</source>
+        <translation type="obsolete">Krypton</translation>
+    </message>
+    <message>
+        <source>Rubidium</source>
+        <translation type="obsolete">Rubidium</translation>
+    </message>
+    <message>
+        <source>Strontium</source>
+        <translation type="obsolete">Strontium</translation>
+    </message>
+    <message>
+        <source>Yttrium</source>
+        <translation type="obsolete">Yttrium</translation>
+    </message>
+    <message>
+        <source>Zirconium</source>
+        <translation type="obsolete">Zirconium</translation>
+    </message>
+    <message>
+        <source>Niobium</source>
+        <translation type="obsolete">Niobium</translation>
+    </message>
+    <message>
+        <source>Molybdenum</source>
+        <translation type="obsolete">Molybdène</translation>
+    </message>
+    <message>
+        <source>Technetium</source>
+        <translation type="obsolete">Technitium</translation>
+    </message>
+    <message>
+        <source>Ruthenium</source>
+        <translation type="obsolete">Ruthénium</translation>
+    </message>
+    <message>
+        <source>Rhodium</source>
+        <translation type="obsolete">Rhodium</translation>
+    </message>
+    <message>
+        <source>Palladium</source>
+        <translation type="obsolete">Palladium</translation>
+    </message>
+    <message>
+        <source>Silver</source>
+        <translation type="obsolete">Argent</translation>
+    </message>
+    <message>
+        <source>Cadmium</source>
+        <translation type="obsolete">Cadmium</translation>
+    </message>
+    <message>
+        <source>Indium</source>
+        <translation type="obsolete">Indium</translation>
+    </message>
+    <message>
+        <source>Tin</source>
+        <translation type="obsolete">Etain</translation>
+    </message>
+    <message>
+        <source>Antimony</source>
+        <translation type="obsolete">Antimoine</translation>
+    </message>
+    <message>
+        <source>Tellurium</source>
+        <translation type="obsolete">Tellure</translation>
+    </message>
+    <message>
+        <source>Iodine</source>
+        <translation type="obsolete">Iode</translation>
+    </message>
+    <message>
+        <source>Xenon</source>
+        <translation type="obsolete">Xénon</translation>
+    </message>
+    <message>
+        <source>Cesium</source>
+        <translation type="obsolete">Césium</translation>
+    </message>
+    <message>
+        <source>Barium</source>
+        <translation type="obsolete">Barium</translation>
+    </message>
+    <message>
+        <source>Lanthanum</source>
+        <translation type="obsolete">Lanthane</translation>
+    </message>
+    <message>
+        <source>Cerium</source>
+        <translation type="obsolete">Cérium</translation>
+    </message>
+    <message>
+        <source>Praseodymium</source>
+        <translation type="obsolete">Praséodyme</translation>
+    </message>
+    <message>
+        <source>Neodymium</source>
+        <translation type="obsolete">Néodyme</translation>
+    </message>
+    <message>
+        <source>Promethium</source>
+        <translation type="obsolete">Prométhium</translation>
+    </message>
+    <message>
+        <source>Samarium</source>
+        <translation type="obsolete">Samarium</translation>
+    </message>
+    <message>
+        <source>Europium</source>
+        <translation type="obsolete">Europium</translation>
+    </message>
+    <message>
+        <source>Gadolinium</source>
+        <translation type="obsolete">Gadolinium</translation>
+    </message>
+    <message>
+        <source>Terbium</source>
+        <translation type="obsolete">Terbium</translation>
+    </message>
+    <message>
+        <source>Dysprosium</source>
+        <translation type="obsolete">Dysprosium</translation>
+    </message>
+    <message>
+        <source>Holmium</source>
+        <translation type="obsolete">Holmium</translation>
+    </message>
+    <message>
+        <source>Erbium</source>
+        <translation type="obsolete">Erbium</translation>
+    </message>
+    <message>
+        <source>Thulium</source>
+        <translation type="obsolete">Thulium</translation>
+    </message>
+    <message>
+        <source>Ytterbium</source>
+        <translation type="obsolete">Ytterbium</translation>
+    </message>
+    <message>
+        <source>Lutetium</source>
+        <translation type="obsolete">Lutétium</translation>
+    </message>
+    <message>
+        <source>Hafnium</source>
+        <translation type="obsolete">Hafnium</translation>
+    </message>
+    <message>
+        <source>Tantalum</source>
+        <translation type="obsolete">Tantale</translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="obsolete">Tungsten</translation>
+    </message>
+    <message>
+        <source>Rhenium</source>
+        <translation type="obsolete">Rhénium</translation>
+    </message>
+    <message>
+        <source>Osmium</source>
+        <translation type="obsolete">Osmium</translation>
+    </message>
+    <message>
+        <source>Iridium</source>
+        <translation type="obsolete">Iridium</translation>
+    </message>
+    <message>
+        <source>Platinum</source>
+        <translation type="obsolete">Platine</translation>
+    </message>
+    <message>
+        <source>Gold</source>
+        <translation type="obsolete">Or</translation>
+    </message>
+    <message>
+        <source>Mercury</source>
+        <translation type="obsolete">Mercure</translation>
+    </message>
+    <message>
+        <source>Thallium</source>
+        <translation type="obsolete">Thallium</translation>
+    </message>
+    <message>
+        <source>Lead</source>
+        <translation type="obsolete">Plomb</translation>
+    </message>
+    <message>
+        <source>Bismuth</source>
+        <translation type="obsolete">Bismuth</translation>
+    </message>
+    <message>
+        <source>Polonium</source>
+        <translation type="obsolete">Polonium</translation>
+    </message>
+    <message>
+        <source>Astatine</source>
+        <translation type="obsolete">Astate</translation>
+    </message>
+    <message>
+        <source>Radon</source>
+        <translation type="obsolete">Radon</translation>
+    </message>
+    <message>
+        <source>Francium</source>
+        <translation type="obsolete">Francium</translation>
+    </message>
+    <message>
+        <source>Radium</source>
+        <translation type="obsolete">Radium</translation>
+    </message>
+    <message>
+        <source>Actinium</source>
+        <translation type="obsolete">Actinium</translation>
+    </message>
+    <message>
+        <source>Thorium</source>
+        <translation type="obsolete">Thorium</translation>
+    </message>
+    <message>
+        <source>Protactinium</source>
+        <translation type="obsolete">Protactinium</translation>
+    </message>
+    <message>
+        <source>Uranium</source>
+        <translation type="obsolete">Uranium</translation>
+    </message>
+    <message>
+        <source>Neptunium</source>
+        <translation type="obsolete">Neptunium</translation>
+    </message>
+    <message>
+        <source>Plutonium</source>
+        <translation type="obsolete">Plutonium</translation>
+    </message>
+    <message>
+        <source>Americium</source>
+        <translation type="obsolete">Américium</translation>
+    </message>
+    <message>
+        <source>Curium</source>
+        <translation type="obsolete">Curium</translation>
+    </message>
+    <message>
+        <source>Berkelium</source>
+        <translation type="obsolete">Berkélium</translation>
+    </message>
+    <message>
+        <source>Californium</source>
+        <translation type="obsolete">Californium</translation>
+    </message>
+    <message>
+        <source>Einsteinium</source>
+        <translation type="obsolete">Einsteinium</translation>
+    </message>
+    <message>
+        <source>Fermium</source>
+        <translation type="obsolete">Fermium</translation>
+    </message>
+    <message>
+        <source>Mendelevium</source>
+        <translation type="obsolete">Mendélévium</translation>
+    </message>
+    <message>
+        <source>Nobelium</source>
+        <translation type="obsolete">Nobélium</translation>
+    </message>
+    <message>
+        <source>Lawrencium</source>
+        <translation type="obsolete">Lawrencium</translation>
+    </message>
+    <message>
+        <source>Rutherfordium</source>
+        <translation type="obsolete">Rutherfordium</translation>
+    </message>
+    <message>
+        <source>Dubnium</source>
+        <translation type="obsolete">Dubnium</translation>
+    </message>
+    <message>
+        <source>Seaborgium</source>
+        <translation type="obsolete">Seaborgium</translation>
+    </message>
+    <message>
+        <source>Bohrium</source>
+        <translation type="obsolete">Bohrium</translation>
+    </message>
+    <message>
+        <source>Hassium</source>
+        <translation type="obsolete">Hassium</translation>
+    </message>
+    <message>
+        <source>Meitnerium</source>
+        <translation type="obsolete">Meitnerium</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/patience.ts b/i18n/fr/patience.ts
index 48ad6d5..ce52383 100644
--- a/i18n/fr/patience.ts
+++ b/i18n/fr/patience.ts
@@ -1,74 +1,98 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jeu</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Changer le Dos des Cartes</translation>
+        <translation type="obsolete">&amp;Changer le Dos des Cartes</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Aider Positionnement</translation>
+        <translation type="obsolete">&amp;Aider Positionnement</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Options</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>A &amp;Propos</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Changer le Dos des Cartes</translation>
+        <translation type="obsolete">Changer le Dos des Cartes</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Aider Positionnement</translation>
+        <translation type="obsolete">Aider Positionnement</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Retourner Une Carte</translation>
+        <translation type="obsolete">Retourner Une Carte</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Retourner Trois Cartes</translation>
+        <translation type="obsolete">Retourner Trois Cartes</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Changer l&apos;arrière des cartes</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Retour auto sur position</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Changer l&apos;arrière des cartes</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Retour auto sur position</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Tourner une carte</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Tourner trois cartes</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/qpdf.ts b/i18n/fr/qpdf.ts
index 2dbb33c..22cc4c9 100644
--- a/i18n/fr/qpdf.ts
+++ b/i18n/fr/qpdf.ts
@@ -1,102 +1,106 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>Qpdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Ajuster à la largeur</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Ajuster à la page</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Ouvrir...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Rechercher...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>1ère page</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Page précédente</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Aller à la page...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Page suivante</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Dernière page</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Aller à la page</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Sélectionner à partir de 1.. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>Impossible de trouver &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>File does not exist !</source>
+        <translation type="obsolete">Le fichier n&apos;existe pas !</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
         <translation>Le fichier n&apos;existe pas !</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 3be73c2..5815647 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,258 +1,265 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème de l&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1&gt; ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;pplication à quitter?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez sur la croix fermement et
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue icon</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue liste</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Le niveau de batterie est très bas.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation>Status Batterie</translation>
+        <translation type="obsolete">Status Batterie</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Lanceur</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation>Recherche de documents</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation>Recherche de documents</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fichiers</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Tous les types de fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouri à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vidéo</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Liés les apps</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limiter la recherche au répertoire: (pas encore utilisé)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Status Batterie</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminer</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminer Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Redémarrer Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Arrêter</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Ces options sont fournies pour être utilisées durant le développement et les tests du système Opie. Dans les conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Arrêt...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sync Connexion</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, vous devriez la mettre à jour.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Non authorisé</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous venez juste de démarrer une Synchronisation pour la 1ere fois, c&apos;est normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Authorisé</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Synchronisation en cours</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contacts&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/reader.ts b/i18n/fr/reader.ts
index c9a17ee..f192339 100644
--- a/i18n/fr/reader.ts
+++ b/i18n/fr/reader.ts
@@ -1,309 +1,950 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>CBarPrefs</name>
+    <message>
+        <source>Toolbar Settings</source>
+        <translation>Préférences Barre d&apos;Outil</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fichier</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigation</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Marques</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indicateurs</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Police</translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;rien&gt;</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Ouvrir fichier</translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation>Défilement Auto</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoris</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Annoter</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Plein écran</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Zoom Avant</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Zoom Arrière</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation>Monter Page</translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation>Descendre Page</translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation>Ligne précédante</translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation>Ligne suivante</translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation>Début</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Fin</translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation>Bouton Echappement</translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation>Bouton Espace</translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation>Bouton Retour Chariot</translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation>Flèche Gauche</translation>
+    </message>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Vitesse de Défilement</translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation>Flèche Droite</translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation>Flèche Bas</translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation>Flèche Haut</translation>
+    </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
+    <message>
+        <source>Tidy-up</source>
+        <translation>Ranger</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Supprimer Favoris</translation>
+    </message>
+    <message>
+        <source>Delete Configuration</source>
+        <translation>Supprimer Configuration</translation>
+    </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
+    <message>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Deux/Une
+Pression</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Rechercher</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Annotation</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>International</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>Ideogrames</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Largeur Ideograme</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Appliquer font
+sur dialogues</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Encodage</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dictionnaire</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Application</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Message</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Deux/Une
+Pression</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Echange
+Actions</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
+        <source>Text</source>
+        <translation>Texte</translation>
+    </message>
+    <message>
+        <source>Strip CR</source>
+        <translation>Bande CR</translation>
+    </message>
+    <message>
+        <source>Dehyphen</source>
+        <translation>Espace Insécable</translation>
+    </message>
+    <message>
+        <source>Single Space</source>
+        <translation>Simple espace</translation>
+    </message>
+    <message>
+        <source>Unindent</source>
+        <translation>Dé-identé</translation>
+    </message>
+    <message>
+        <source>Reparagraph</source>
+        <translation>Re-paragrapher</translation>
+    </message>
+    <message>
+        <source>Double Space</source>
+        <translation>Espace double</translation>
+    </message>
+    <message>
+        <source>Remap</source>
+        <translation>Remapper</translation>
+    </message>
+    <message>
+        <source>Embolden</source>
+        <translation>Mettre en Gras</translation>
+    </message>
+    <message>
+        <source>Full Justify</source>
+        <translation>Justifier</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation>Identé</translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation>Recouvrement
+Page</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Zoom sur
+Images</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Marge</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Entête de
+Paragraphe</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Entête de
+Ligne</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Marques</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Fonte</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoris</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Annoter</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Aller à</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Création auto</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Enregistrer</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Ordonner</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Marquer Bloc</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Copier Bloc</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Flottant</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Barre unique</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Barre Menu/Outils</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Multiple barres</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Entête</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Dessous</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Droite</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Gauche</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Minimisé</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Déplaçable</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Select Action</source>
+        <translation>Sélectionner Action</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Annotation</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dictionnaire</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Presse-papiers</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Sélecteur</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Déselecteur</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>Dejpluck</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Permanent</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Défilement</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Monter Page</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Descendre Page</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Aller au Début</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Aller à la Fin</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Saut</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Défilement page/ligne</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>Préférences OpieReader</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Disposition</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>Disposition(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Locale</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Divers</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>Boutons</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Enregister URL</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Presse-papiers</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Fichier local</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>Fichier global</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Plein écran</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Zoom Avant</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Zoom Arrière</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation>Choisir Police</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Encodage</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Ideogram</translation>
+    </message>
+</context>
+<context>
     <name>QTReaderApp</name>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>On Action...</source>
-        <translation>Sur Action...</translation>
+        <translation type="obsolete">Sur Action...</translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation>Ouvrir Fichier</translation>
+        <translation type="obsolete">Ouvrir Fichier</translation>
     </message>
     <message>
         <source>Autoscroll</source>
-        <translation>Défilement Auto</translation>
+        <translation type="obsolete">Défilement Auto</translation>
     </message>
     <message>
         <source>Mark</source>
-        <translation>Marquer</translation>
+        <translation type="obsolete">Marquer</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation>Navigation</translation>
     </message>
     <message>
         <source>Scroll</source>
         <translation>Défilement</translation>
     </message>
     <message>
         <source>Jump</source>
         <translation>Sauter</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
         <translation>Défilement page/ligne</translation>
     </message>
     <message>
         <source>Set Overlap</source>
-        <translation>Recouvrement</translation>
+        <translation type="obsolete">Recouvrement</translation>
     </message>
     <message>
         <source>Use Cursor</source>
-        <translation>Utiliser Curseur</translation>
+        <translation type="obsolete">Utiliser Curseur</translation>
     </message>
     <message>
         <source>Set Dictionary</source>
-        <translation>Dictionnaire</translation>
+        <translation type="obsolete">Dictionnaire</translation>
     </message>
     <message>
         <source>Two/One Touch</source>
         <translation>Deux/Une touche(s)</translation>
     </message>
     <message>
         <source>Target</source>
-        <translation>Cible</translation>
+        <translation type="obsolete">Cible</translation>
     </message>
     <message>
         <source>Annotation</source>
         <translation>Annotation</translation>
     </message>
     <message>
         <source>Dictionary</source>
-        <translation>Dictionnaire</translation>
+        <translation type="obsolete">Dictionnaire</translation>
     </message>
     <message>
         <source>Clipboard</source>
-        <translation>Presse-papiers</translation>
+        <translation type="obsolete">Presse-papiers</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Rechercher...</translation>
     </message>
     <message>
         <source>Continuous</source>
-        <translation>Permanent</translation>
+        <translation type="obsolete">Permanent</translation>
     </message>
     <message>
         <source>Markup</source>
-        <translation>Marques</translation>
+        <translation type="obsolete">Marques</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation type="obsolete">Aucun</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texte</translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>HTML</source>
-        <translation>HTML</translation>
+        <translation type="obsolete">HTML</translation>
     </message>
     <message>
         <source>Peanut/PML</source>
-        <translation>Peanut/PML</translation>
+        <translation type="obsolete">Peanut/PML</translation>
     </message>
     <message>
         <source>Layout</source>
-        <translation>Disposition</translation>
+        <translation type="obsolete">Disposition</translation>
     </message>
     <message>
         <source>Strip CR</source>
-        <translation>Bande CR</translation>
+        <translation type="obsolete">Bande CR</translation>
     </message>
     <message>
         <source>Dehyphen</source>
-        <translation>Espace Insécable</translation>
+        <translation type="obsolete">Espace Insécable</translation>
     </message>
     <message>
         <source>Single Space</source>
-        <translation>Simple espace</translation>
+        <translation type="obsolete">Simple espace</translation>
     </message>
     <message>
         <source>Unindent</source>
-        <translation>Dé-identé</translation>
+        <translation type="obsolete">Dé-identé</translation>
     </message>
     <message>
         <source>Re-paragraph</source>
-        <translation>Re-paragrapher</translation>
+        <translation type="obsolete">Re-paragrapher</translation>
     </message>
     <message>
         <source>Double Space</source>
-        <translation>Espace double</translation>
+        <translation type="obsolete">Espace double</translation>
     </message>
     <message>
         <source>Indent+</source>
-        <translation>Identation +</translation>
+        <translation type="obsolete">Identation +</translation>
     </message>
     <message>
         <source>Indent-</source>
-        <translation>Indentation -</translation>
+        <translation type="obsolete">Indentation -</translation>
     </message>
     <message>
         <source>Repalm</source>
-        <translation>Repalm</translation>
+        <translation type="obsolete">Repalm</translation>
     </message>
     <message>
         <source>Remap</source>
-        <translation>Remapper</translation>
+        <translation type="obsolete">Remapper</translation>
     </message>
     <message>
         <source>Embolden</source>
-        <translation>Mettre en Gras</translation>
+        <translation type="obsolete">Mettre en Gras</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Zoom Avant</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Zoom Arrière</translation>
     </message>
     <message>
         <source>Ideogram/Word</source>
-        <translation>Idéogrammes/Mots</translation>
+        <translation type="obsolete">Idéogrammes/Mots</translation>
     </message>
     <message>
         <source>Set width</source>
-        <translation>Fixer largeur</translation>
+        <translation type="obsolete">Fixer largeur</translation>
     </message>
     <message>
         <source>Encoding</source>
-        <translation>Encodage</translation>
+        <translation type="obsolete">Encodage</translation>
     </message>
     <message>
         <source>Ascii</source>
-        <translation>Ascii</translation>
+        <translation type="obsolete">Ascii</translation>
     </message>
     <message>
         <source>UTF-8</source>
-        <translation>UTF-8</translation>
+        <translation type="obsolete">UTF-8</translation>
     </message>
     <message>
         <source>UCS-2(BE)</source>
-        <translation>UCS-2(BE)</translation>
+        <translation type="obsolete">UCS-2(BE)</translation>
     </message>
     <message>
         <source>USC-2(LE)</source>
-        <translation>USC-2(LE)</translation>
+        <translation type="obsolete">USC-2(LE)</translation>
     </message>
     <message>
         <source>Palm</source>
-        <translation>Palm</translation>
+        <translation type="obsolete">Palm</translation>
     </message>
     <message>
         <source>Windows(1252)</source>
-        <translation>Windows(1252)</translation>
+        <translation type="obsolete">Windows(1252)</translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation>Choisir Police</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Annoter</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Aller à</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>Création auto.</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation>Ordonner</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Début Bloc</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copier Bloc</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation>Format</translation>
+        <translation type="obsolete">Format</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Marques</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Clore Recherche</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation>EnregisterEnregister</translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation>Fermer Editer</translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Préférences</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuration</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Enregister Config</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Charger Config</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Supprimer Config</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>Barre d&apos;Outils</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Executer Script</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exporter Liens</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Début</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Fin</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Scroller</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Fixer Cible</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Pause Paras</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Fixé Encodage</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Ideogram</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoris</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Lecteur</translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation>Parcourir</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Caché</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 2d1f215..243e79c 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,107 +1,119 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fixer mot de passe</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer mot de passe</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Mot de passe incorrect</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Le mot de passe est incorrect.
 Accès refusé</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Entrer le nouveau mot de passe</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Réentrez le mot de passe</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Paramètres de Sécurité</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le mot de passe</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Effacer le mot de passe</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Demander le mot de passe au démarrage</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepter la synchronisation par réseau de :</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Ce code secret permet un niveau de protection minimal pour l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (par défaut)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Mot de Passe</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Nom de connexion</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Connexion Automatique</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index 909125e..7d35896 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -1,159 +1,159 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Luminosité</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
-        <translation>Visualiseur d&apos;images</translation>
+        <translation>Visualiseur d&apos;Images</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Mirroir horizontal</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Mirroir vertical</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rotation 180°</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rotation 90°</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Visualiseur d&apos;images</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Vrai couleur</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Aficchage</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vignettes</translation>
     </message>
     <message>
         <source>Preferences..</source>
         <translation>Préférences..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
         <translation>Info image...</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Ouvrir ...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Rotation 270°</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Luminosité ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Noir et Blanc</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Ajuster à l&apos;écran</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 couleurs</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 niveau(x) alpha</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit canal alpha</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Diaporama</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Arrêter Diaporama</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Diaporama</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Délai entre les images</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Diaporama en boucle</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Montrer les images en ordre inverse</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Charger les images tournées à 90 degrés</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Chargement rapide des images</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/snake.ts b/i18n/fr/snake.ts
index acf47ff..6642f7e 100644
--- a/i18n/fr/snake.ts
+++ b/i18n/fr/snake.ts
@@ -1,44 +1,52 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Serpent</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nouveau Jeu</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>SERPENT !</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Utilisez les touches de directions pour contrôler
 le serpent. Le but est de manger le plus de souris
 sans rentrer dans les murs ni se modre la queue.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Appuyez sur n&apos;importe quelle touche pour commencer</translation>
+        <translation type="obsolete">Appuyez sur n&apos;importe quelle touche pour commencer</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>    Score :    %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER !
 Votre score : %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Pressez n&apos;importe quelle touche pour recommencer.</translation>
+        <translation type="obsolete">Pressez n&apos;importe quelle touche pour recommencer.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Pressez une touche pour commencer</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Pressez une touche pour commencer une nouvelle partie.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/stockticker.ts b/i18n/fr/stockticker.ts
new file mode 100644
index 0000000..76e85a4
--- a/dev/null
+++ b/i18n/fr/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Ouvrir Fichier</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Fermer</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Retour</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Avancer</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Home</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Ajouter au favoris</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Fichier</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Go</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Historique</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Favoris</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Retour</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avancer</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Consulter Symbole</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Entrer le motif de recherche.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 12af6af..9eca32f 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -1,316 +1,375 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Ce graphe représente cobien de mémoire est actuellement  utilisée sur cette carte de mémoire CompactFlash.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur ce disque.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur cette carte de mémoire Secure Digital.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Ce graphe représente cobien de mémoire est actuellement  utilisée dans la mémoire centrale (ie  mémoire Flash).</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur le dique RAM.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilisation du processeur par les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation du processeur par le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type :</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page montre la charge du processeur.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 ko)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 ko)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire Totale: %1 ko</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Cette page montre l&apos;utilisation de la mémoire par votre PDA.
 La mémoire est divisée en catégories comme suit:
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Utilisé#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Utilisé par</translation>
+        <translation type="obsolete">Utilisé par</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Voici la liste de tous les modules chargés sur cet assistant personnel.
 
 Cliquez et maintenez appuyer pour voir les informations à propos du module ou pour le décharger.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Sélectionnez une commande puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer la commande au module sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Cliquez ici pour envoyer la commande sélectionné au module sélectionné.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Cette zone décrit en détail les informations au sujet de ce module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>Voulez-vous vraiment exécuter
+        <translation type="obsolete">Voulez-vous vraiment exécuter
 
 </translation>
     </message>
+    <message>
+        <source>Used by</source>
+        <translation>Utilisé par</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation>Vous désirez vraiment exécuter %1 pour ce module ?</translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisé (%1 Ko)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponible (%1 Ko)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 Ko</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commande</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Voici la liste de tous les processus en cours sur cet assistant personnel
 
 Cliquez et maintenez appuyer pour voir les informations à propos du processus ou pour lui envoyer un signal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Sélectionnez un signal puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer le signal au processus sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Cliquer ici pour envoyer à ce processus le signal choisi.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Cette zone montre des informations détaillés à propos de ce processus.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>Voulez-vous vraiment envoyer
+        <translation type="obsolete">Voulez-vous vraiment envoyer
 </translation>
     </message>
+    <message>
+        <source>You really want to send %1 to this process?</source>
+        <translation>Vous désirez vraiment envoyer %1 à ce processus ?</translation>
+    </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card: </source>
-        <translation>Carte CF:</translation>
+        <translation type="obsolete">Carte CF:</translation>
     </message>
     <message>
         <source>Hard Disk </source>
-        <translation>Disque Dur</translation>
+        <translation type="obsolete">Disque Dur</translation>
     </message>
     <message>
         <source>SD Card </source>
-        <translation>Carte SD</translation>
+        <translation type="obsolete">Carte SD</translation>
     </message>
     <message>
         <source>Hard Disk /dev/hd </source>
-        <translation>Disque /dev/hd</translation>
+        <translation type="obsolete">Disque /dev/hd</translation>
     </message>
     <message>
         <source>SCSI Hard Disk /dev/sd </source>
-        <translation>Disque SCSI /dev/sd</translation>
+        <translation type="obsolete">Disque SCSI /dev/sd</translation>
     </message>
     <message>
         <source>Int. Storage </source>
-        <translation>Stockage int</translation>
+        <translation type="obsolete">Stockage int</translation>
     </message>
     <message>
         <source>CF</source>
-        <translation>CF</translation>
+        <translation type="obsolete">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>Ce graphe représente cobien de mémoire est actuellement  utilisée sur cette carte de mémoire CompactFlash.</translation>
+        <translation type="obsolete">Ce graphe représente cobien de mémoire est actuellement  utilisée sur cette carte de mémoire CompactFlash.</translation>
     </message>
     <message>
         <source>Ha</source>
-        <translation>Ha</translation>
+        <translation type="obsolete">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur ce disque.</translation>
+        <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur ce disque.</translation>
     </message>
     <message>
         <source>SD</source>
-        <translation>SD</translation>
+        <translation type="obsolete">SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur cette carte de mémoire Secure Digital.</translation>
+        <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur cette carte de mémoire Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
-        <translation>SC</translation>
+        <translation type="obsolete">SC</translation>
     </message>
     <message>
         <source>In</source>
-        <translation>In</translation>
+        <translation type="obsolete">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>Ce graphe représente cobien de mémoire est actuellement  utilisée dans la mémoire centrale (ie  mémoire Flash).</translation>
+        <translation type="obsolete">Ce graphe représente cobien de mémoire est actuellement  utilisée dans la mémoire centrale (ie  mémoire Flash).</translation>
     </message>
     <message>
         <source>RAM disk</source>
-        <translation>Disque RAM</translation>
+        <translation type="obsolete">Disque RAM</translation>
     </message>
     <message>
         <source>RA</source>
-        <translation>RA</translation>
+        <translation type="obsolete">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>Ce graphe représente combien de mémoire est actuellement  utilisée sur le dique RAM.</translation>
+        <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur le dique RAM.</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info système</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoire</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Stockage</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processus</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version :</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilé par :</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version :</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Construit le :</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version :</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;Modèle :</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;Fabricant :</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Cette page montre la version courante de Opie, du noyau Linux, et de la distribution installés sur cet appareil de poche.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index f9226cc..21f7354 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -1,521 +1,529 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>Format de l&apos;heure</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>J/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>M/J hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>12/24H</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>24H</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>12H</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>Format de date</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>Début semaine</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>Heure système</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Prévoir</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
-        <translation>Vous avez demandé un délai de</translation>
+        <translation type="obsolete">Vous avez demandé un délai de</translation>
     </message>
     <message>
         <source> minutes, but only </source>
-        <translation>minutes, mais seulement</translation>
+        <translation type="obsolete">minutes, mais seulement</translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>minutes sont écoulées depuis la dernière vérification&lt;br&gt;Continuer?</translation>
+        <translation type="obsolete">minutes sont écoulées depuis la dernière vérification&lt;br&gt;Continuer?</translation>
     </message>
     <message>
         <source>Continue?</source>
         <translation>Continuer?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Exécution:
 ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>Erreur lors de la synchronisation de l&apos;heure.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>Erreur lors de l&apos;execution de ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Serveur NTP</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Erreur lors de la récupération de l&apos;heure
 à partir de l&apos;heure du serveur:</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>secondes</translation>
+        <translation type="obsolete">secondes</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation>Impossible de se connecter au serveur</translation>
     </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Vous avez demandé un delai de %1 minutes, mais seulement %2 minutes se sont écoulés.&lt;br&gt;Continuer ?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 secondes</translation>
+    </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>Heure de départ</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>Temps écoulé</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Nouvelle heure</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Récupérer l&apos;heure sur serveur NMP</translation>
     </message>
 </context>
 <context>
     <name>Ntp</name>
     <message>
         <source>time.fu-berlin.de</source>
         <translation type="obsolete">chronos.cru.fr</translation>
     </message>
     <message>
         <source>Run NTP?</source>
         <translation type="obsolete">Lancer NTP?</translation>
     </message>
     <message>
         <source>Running:</source>
         <translation type="obsolete">Running:</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="obsolete">Erreur lors de l&apos;execution de ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="obsolete">secondes</translation>
     </message>
     <message>
         <source>last [h]</source>
         <translation type="obsolete">dernier [h]</translation>
     </message>
     <message>
         <source>offset [s]</source>
         <translation type="obsolete">offset [s]</translation>
     </message>
     <message>
         <source>shift [s/h]</source>
         <translation type="obsolete">Décalage [s/h]</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="obsolete">s/h</translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation type="obsolete">Obtenir l&apos;heure par le réseau</translation>
     </message>
     <message>
         <source>Set predicted time: </source>
         <translation type="obsolete">Prévision de l&apos;heure:</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
         <translation type="obsolete">Impossible de se connecter au serveur</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="obsolete">Prévoir</translation>
     </message>
     <message>
         <source>NTP</source>
         <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="obsolete">Géneral</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="obsolete">Options</translation>
     </message>
     <message>
         <source>ntp error</source>
         <translation type="obsolete">erreur ntp</translation>
     </message>
     <message>
         <source>Error while getting time form network!</source>
         <translation type="obsolete">Erreur lors de l&apos;obtention de l&apos;heure par le réseau !</translation>
     </message>
     <message>
         <source>Error while getting time form
  server</source>
         <translation type="obsolete">Lancer NTP ?</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
         <translation type="obsolete">Vous avez demandé un délai de %1, mais seulement %2 minute(s) se sont écoulée(s).&lt;br&gt; Relancer NTP ?</translation>
     </message>
 </context>
 <context>
     <name>NtpBase</name>
     <message>
         <source>Network Time</source>
         <translation type="obsolete">Network Time</translation>
     </message>
     <message>
         <source>Get time from network</source>
         <translation type="obsolete">Obtenir la date d&apos;un serveur NTP</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="obsolete">Heure de départ:</translation>
     </message>
     <message>
         <source>nan</source>
         <translation type="obsolete">Aucune</translation>
     </message>
     <message>
         <source>Time Shift:</source>
         <translation type="obsolete">Décalage de l&apos;heure:</translation>
     </message>
     <message>
         <source>New Time:</source>
         <translation type="obsolete">Nouvelle heure:</translation>
     </message>
     <message>
         <source>Esimated Shift:</source>
         <translation type="obsolete">Décalage estimé:</translation>
     </message>
     <message>
         <source>Predicted Time:</source>
         <translation type="obsolete">Heure calculée:</translation>
     </message>
     <message>
         <source>Mean shift:</source>
         <translation type="obsolete">Décalage moyen:</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="obsolete">Fixer la prévision de l&apos;heure</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="obsolete">Heure prévu</translation>
     </message>
     <message>
         <source>Use</source>
         <translation type="obsolete">Utiliser</translation>
     </message>
     <message>
         <source>as</source>
         <translation type="obsolete">comme</translation>
     </message>
     <message>
         <source>NTP server to get the time from the network.</source>
         <translation type="obsolete">serveur NTP pour obtenir la date et l&apos;heure.</translation>
     </message>
     <message>
         <source>Wait for </source>
         <translation type="obsolete">Attendre</translation>
     </message>
     <message>
         <source>minutes until</source>
         <translation type="obsolete">minute(s) avant</translation>
     </message>
     <message>
         <source>NTP tries to syncronises the clock with the network.</source>
         <translation type="obsolete">que NTP essaye de synchroniser l&apos;heure avec le réseau.</translation>
     </message>
     <message>
         <source>Insure a delay of</source>
         <translation type="obsolete">S&apos;assurer d&apos;un délai de</translation>
     </message>
     <message>
         <source>a new NTP lookup will be used to predict the time.</source>
         <translation type="obsolete">un nouvel appel à NTP sera utilisé pour prédire l&apos;heure.</translation>
     </message>
     <message>
         <source>Set time</source>
         <translation type="obsolete">Régler l&apos;heure</translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="obsolete">Principal</translation>
     </message>
     <message>
         <source>Manual</source>
         <translation type="obsolete">Manuel</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="obsolete">Paramètres</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="obsolete">Prévoir</translation>
     </message>
     <message>
         <source>NTP</source>
         <translation type="obsolete">NTP</translation>
     </message>
     <message>
         <source>Advanced settings</source>
         <translation type="obsolete">Paramètres avancés</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>dérive de l&apos;heure prévue</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Dérive estimée</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>Temps prévu</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>Dérive [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>Dernière [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>Décalage [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>Heure prévue</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fixer prévision de l&apos;heure</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>s/h</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>secondes</translation>
     </message>
 </context>
 <context>
     <name>SetDateTime</name>
     <message>
         <source>Time Zone</source>
         <translation type="obsolete">Zone</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="obsolete">Date</translation>
     </message>
     <message>
         <source>Time format</source>
         <translation type="obsolete">Format d&apos;heure</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="obsolete">24H</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="obsolete">12H</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="obsolete">Début semaine</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="obsolete">Dimanche</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="obsolete">Lundi</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="obsolete">Format de date</translation>
     </message>
     <message>
         <source>Applet format</source>
         <translation type="obsolete">Affichage barre</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="obsolete">hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="obsolete">J/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="obsolete">M/J hh:mm</translation>
     </message>
     <message>
         <source>System Time</source>
         <translation type="obsolete">Paramètres Horaires</translation>
     </message>
 </context>
 <context>
     <name>SetTime</name>
     <message>
         <source>Hour</source>
         <translation type="obsolete">H.</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="obsolete">Min.</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="obsolete">am</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="obsolete">pm</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Serveur NTP</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>minutes entre 2 synchronisation de l&apos;heure</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>minutes entre 2 mise à jour de prévision</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>Afficher les informations sur le serveur NTP</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>Afficher les infos de prediction de l&apos;heure</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuseau horaire</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Synchroniser l&apos;heure</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>Fixer la prévision de l&apos;heure</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tetrix.ts b/i18n/fr/tetrix.ts
index 9ea138a..3d4718b 100644
--- a/i18n/fr/tetrix.ts
+++ b/i18n/fr/tetrix.ts
@@ -1,30 +1,64 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>vide</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Entrez votre nom !</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Highscores</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Points</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Niveau</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Suivant</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Score</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Niveau</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Effacé</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 0e52b39..1988293 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -1,267 +1,277 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Enregistrer Sous</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Couper</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Chercher...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom avant</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom arrière</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Couper les lignes</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Démarrer avec un nouveau fichier</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edition</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Affichage</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Trouver suivant</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fermer &quot;Rechercher&quot;</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editeur Texte</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>Fichier .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Raccourci de Document</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texte</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Insérer la date et l&apos;heure</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Options avancées</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Demandé avant de Quitter</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Toujours ouvrir les fichiers raccourci</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Droits du Fichier</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>Barre de Recherche Ouverte</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>Aller à la ligne...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>Sauvegarde auto 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>Vous avez sélectionné un fichier &lt;b&gt;.desktop&lt;/b&gt;.&lt;br&gt;Ouvrir le fichier &lt;b&gt;.desktop&lt;/b&gt; ou son &lt;b&gt;lien&lt;/b&gt;?</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>Edition de texte</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>L&apos;écriture a échouée</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>Sans Nom</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Droits</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Choisir une police</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Voulez-vous réellement &lt;B&gt;supprimer&lt;/b&gt; le fichier courant
+        <translation type="obsolete">Voulez-vous réellement &lt;B&gt;supprimer&lt;/b&gt; le fichier courant
 du disque ?&lt;br&gt; C&apos;est &lt;b&gt;irréversible !!&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit est sous copyrigth&lt;br&gt;2000 Trolltech AS, et &lt;BR&gt;2002 par &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt; et est sous license GPL</translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation>TextEdit</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>Vous n&apos;avez pas sauvegardé les changements.
 Continuer et sauvegarder ?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>Ne pas Sauvegarder</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Pas assez de lignes</translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Text Editor</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Confirmez-vous la &lt;BR&gt;&lt;B&gt;suppression&lt;/B&gt; du fichier courant ?
+&lt;B&gt;Cette suppression est irréversible !&lt;/B&gt;</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fixer les Droits du Fichier</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fixer les droits du fichier pour :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>autre</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Propriétaire</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lecture</translation>
     </message>
     <message>
         <source>write</source>
         <translation>écriture</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>exécution</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Avertissement</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Erreur- pas d&apos;utilisateur</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Erreur- pas de groupe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Erreur lors de la définition du propriétatire ou du groupe</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Erreur lors de la défintion du mode</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Droits du Fichier</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tictac.ts b/i18n/fr/tictac.ts
index 7c08eec..6c3d04a 100644
--- a/i18n/fr/tictac.ts
+++ b/i18n/fr/tictac.ts
@@ -1,42 +1,49 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>TicTac</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>L&apos;ordinateur commence</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>L&apos;humain commence ;)</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Joué !</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Cliquez sur Joué pour démarrer</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>A vous de jouer</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Vous avez gagné !</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>L&apos;ordinateur a gagné !</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Match nul</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tinykate.ts b/i18n/fr/tinykate.ts
new file mode 100644
index 0000000..2b56dc9
--- a/dev/null
+++ b/i18n/fr/tinykate.ts
@@ -0,0 +1,62 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKate</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Sauver</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Sauver sous</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Fichier</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Font +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Font -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Vue</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Outils</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Surlignage</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Options</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Sansnom %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 1657121..35ee222 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,120 +1,187 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Propriétaire : </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Remplissez vos paramètres personnels</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Aucun module trouvé</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Aucun module activé</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Cliquez ici pour lancer l&apos;application associée</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Aujourd&apos;hui par Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Cliquer ici pour accéder à la fenêtre de configuration</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
-        <translation>Config &quot;Aujourd&apos;hui&quot;</translation>
+        <translation type="obsolete">Config &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Chargement et ordre des modules :</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Activer/Ordonner</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Afficher automatique
+        <translation type="obsolete">Afficher automatique
 à l&apos;allumage ?
 (Opie seulement)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>minutes inactives</translation>
+        <translation type="obsolete">minutes inactives</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Vérifier si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement au démarrage.</translation>
+        <translation type="obsolete">Vérifier si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement au démarrage.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Après combien de minutes de  veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée ?</translation>
+        <translation type="obsolete">Après combien de minutes de  veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée ?</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Taille de l&apos;icône</translation>
+        <translation type="obsolete">Taille de l&apos;icône</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Définir la taille de l&apos;icône en pixel</translation>
+        <translation type="obsolete">Définir la taille de l&apos;icône en pixel</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Rafraîchir</translation>
+        <translation type="obsolete">Rafraîchir</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Périodicité des rafraîchissements de &quot;Aujourd&apos;hui&quot;</translation>
+        <translation type="obsolete">Périodicité des rafraîchissements de &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>sec</translation>
+        <translation type="obsolete">sec</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>jamais</translation>
+        <translation type="obsolete">jamais</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Sélectionnez une case à cocher pour activer/désactiver un module ou utiliser les flèches de droite pour changer l&apos;ordre d&apos;apparition</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Config Aujourd&apos;hui</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>Form1</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Vérifie si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement à l&apos;allumage.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>Démarrage auto à l&apos;allumage ?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>Petite bannière</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Utiliser une petite bannière</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Après combien de minutes de  veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>minutes inactives</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>pixel</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Définir la taille de l&apos;icône en pixel</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>taille icône</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>sec</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>jamais</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Périodicité des rafraîchissements de &quot;Aujourd&apos;hui&quot;</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>rafraichir</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 7be58bb..2b2ae7a 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,586 +1,733 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>MainWindow</name>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Alarme à %1&lt;/h1&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmes</translation>
     </message>
     <message>
         <source>Reminders</source>
-        <translation>Rappels</translation>
+        <translation type="obsolete">Rappels</translation>
     </message>
     <message>
         <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <translation type="obsolete">X-Ref</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Récurrence</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Task Editor</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Entrer une Tâche</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editer la Tâche</translation>
     </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Opie Todolist</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation>Silencieuse</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>Forte</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>Nouvelle à Partir d&apos;un Modèle</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Nouvelle Tâche</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>Cliquez ici pour créer une nouvelle tâche.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editer la Tâche</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>Cliquez ici pour modifier la tâche courante.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>Voir la Tâche</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>Supprimer...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>Cliquez  ici pour effacer la tâche courante.</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>Supprimer Tout...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>Suppression Terminé</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Transmettre</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>Cliquez ici pour transmettre la tâche courante à un autre dispositif.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Afficher les tâches terminées</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Montrer seulement les tâches échues</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Afficher les échéances</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Afficher la barre d&apos;outils</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Donnée</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>Edition Rapide</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Voici la liste de toutes les tâches en cours.
 
 La liste affiche les informations suivantes:
 1. Terminé - Un marque verte indique une tâche terminée. Cliquer ici pour terminer un tâche.
 2. Priorité - Une représentation graphique de la priorité de la tâche. Double-cliquer ici pour la modifier.
 3. Description - Date d&apos;échéance de la tâche. This colonne peut être affichée ou cachée en séléctionnant Options-&gt;&apos;Montrer les dates d&apos;échéance&apos; à partir du menu ci-dessus.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Toutes les Catégories</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Plus de place disponible</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>&quot;Tâche&quot; n&apos;a pas pu
 enregistrer vos changements.
 Libérez de l&apos;espace
 et réessayez.
 
 Quitter?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tâche</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Impossible d&apos;éditer les données, synchronization en cours</translation>
+        <translation type="obsolete">Impossible d&apos;éditer les données, synchronization en cours</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>toutes les tâches ?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>toutes les tâches effectuées ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classé</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>&lt;P&gt;%1 nouvelle(s) tâche(s) arrivée(s).&lt;p&gt; Ajouter à votre liste ?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nouvelles Tâches</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorité</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Echéance</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurer les Modèles</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité :</translation>
     </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Donnée en cours de synchronisation, édition impossible</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Donnée en cours de synchronisation, édition impossible</translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Editeur de Modèle</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Editer</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Nouveau Modèle %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Cliquez ici pour définir la prioriré de la nouvelle tâche.
+
+Cette partie est appelée &quot;la barre d&apos;outils&quot;.
+
+Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Entrez la description de la nouvelle tâche ici.
+
+Cette partie est appelé &quot;la barre d&apos;outils&quot;.
+
+Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Plus</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Cliquez ici pour entrer des informations supplémentaires pour la nouvelle tâche.
+
+Cette partie est appelé &quot;la barre d&apos;outils&quot;.
+
+Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Valider</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Cliquez ici pour ajouter une nouvelle tâche.
+
+Cette partie est appelé &quot;la barre d&apos;outils&quot;.
+
+Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Cliquez ici pour réinitialiser les informations de la nouvelle tâche.
+
+Cette partie est appelé &quot;la barre d&apos;outils&quot;.
+
+Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vue en Tableau</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 jour(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation>Date</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Heure</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Description :</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Entrer une brève description de la tâches ici.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Terminé</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>En Cours</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Acheter</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Organiser</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Obtenir</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Mettre à Jour</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Créer</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Planifier</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Appeler</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Courrier</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Selectionner la priorité de la tâche ici.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Très Haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basse</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Très Basse</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie :</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Selectionner la catégorie de la tâche.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tâche Récurrente</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Cliquer ici si cette tâches doit-être répétée. La fréquence est choisie dans le tableau de Répétition.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes :</translation>
+        <translation type="obsolete">Notes :</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Entrer des informations supplémentaires sur la tâche ici.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Liste des Tâches</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Résumé :</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Etat :</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Cliquez ici pour définir l&apos;état courant de la tâche.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Démarrée</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Reportée</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Terminée</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Arrétée</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avancement :</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Selectionnez l&apos;avancement de la tâche ici.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Date de début :</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Cliquez ici pour définir la date de début de la tâche.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Date d&apos;écheance :</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Cliquez ici pour définir la date à laquelle la tâche doit-être terminée.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Terminée :</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Cliquez ici pour définir la tâche comme &quot;Terminée&quot;.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Cliquez ici pour définir la date à laquelle la tâche a été terminée.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Mode Maintenance :</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Cliquez ici pour fixer le rôle du mainteneur.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Responsable</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Fait par</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Coordinateur</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Mainteneur :</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>C&apos;est le nom du mainteneur actuel de la tâche.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Cliquez ici pour selectionner le mainteneur de la tâche.</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialog</name>
     <message>
         <source>Template Editor</source>
-        <translation>Editeur de Modèle</translation>
+        <translation type="obsolete">Editeur de Modèle</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Ajouter</translation>
+        <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editer</translation>
+        <translation type="obsolete">Editer</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Effacer</translation>
+        <translation type="obsolete">Effacer</translation>
     </message>
 </context>
 <context>
     <name>TemplateDialogImpl</name>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>New Template %1</source>
-        <translation>Nouveau Modèle %1</translation>
+        <translation type="obsolete">Nouveau Modèle %1</translation>
     </message>
 </context>
 <context>
     <name>Todo</name>
     <message>
         <source>More</source>
-        <translation>Plus</translation>
+        <translation type="obsolete">Plus</translation>
     </message>
     <message>
         <source>Enter</source>
-        <translation>Valider</translation>
+        <translation type="obsolete">Valider</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuler</translation>
+        <translation type="obsolete">Annuler</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Cliquer ici pour définir la prioriré de la nouvelle tâche.
+        <translation type="obsolete">Cliquer ici pour définir la prioriré de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Entrer la description de la nouvelle tâche ici.
+        <translation type="obsolete">Entrer la description de la nouvelle tâche ici.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Cliquer ici pour entrer des informations supplémentaires pour la nouvelle tâche.
+        <translation type="obsolete">Cliquer ici pour entrer des informations supplémentaires pour la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Cliquer ici pour ajouter une nouvelle tâche.
+        <translation type="obsolete">Cliquer ici pour ajouter une nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Cliquer ici pour réinitialiser les informations de la nouvelle tâche.
+        <translation type="obsolete">Cliquer ici pour réinitialiser les informations de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/ubrowser.ts b/i18n/fr/ubrowser.ts
new file mode 100644
index 0000000..9e73c9f
--- a/dev/null
+++ b/i18n/fr/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>- uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - uBrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>Erreur !</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>Adresse IP non trouvée</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Erreur lors de la création de la socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Erreur lors de la connexion à la socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/usermanager.ts b/i18n/fr/usermanager.ts
index 58d8010..8384207 100644
--- a/i18n/fr/usermanager.ts
+++ b/i18n/fr/usermanager.ts
@@ -1,32 +1,36 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Ajouter un groupe</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Editer un groupe</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>Gestion des Utilisateurs OPIE </translation>
+        <translation type="obsolete">Gestion des Utilisateurs OPIE </translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Opie User Manager</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Ajouter un Utilisateur</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Editer un Utilisateur</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/wellenreiter.ts b/i18n/fr/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/fr/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/hu/.directory b/i18n/hu/.directory
index 9613410..7a60d54 100644
--- a/i18n/hu/.directory
+++ b/i18n/hu/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Hungarian
 Name[da]=Ungarnsk
 Name[es]=Húngaro
 Name[it]=Ungherese
 Name[pt]=Húngaro
 Name[pt_BR]=Húngaro
 Name[sl]=Madžarščina
+Name[de]=Ungarisch
+Name[nl]=Hongaars
\ No newline at end of file
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 935351a..8363e1c 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -1,917 +1,916 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Teljes név</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kapcsolat</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Felvesz</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kapcsolat</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Keres</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Levelet küld</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Bejegyzést átsugároz</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Az én személyes adataim</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Nézet</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizálás folyamatban</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Az én személyes adataim szerkesztése</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Cím szerkesztése</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kapcsolatok - Az én személyes adataim</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nem lehet az információkat menteni.
 Szabadítson fel némi helyet
 és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>vCard importálása</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Keresés bezárása</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Minden adat mentése</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Beállítás</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nem található</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Névjegyek</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Névjegy</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Kezdj keresni</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Helyes fájltípus ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Igen</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nem</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>Ehhez a keresési mintához
 nem találok kapcsolatot!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>A kiválasztott fájl
 nem &quot;.vcf&quot;-re végződik.
 Tényleg meg akarja nyitni?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Kapcsolat hozzáadása?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tényleg hozzá akarja adni
 %1-t a kapcsolatokhoz?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Mind igen</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Keresési mód</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Szabályos kifejezés használata</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Helyettesítők (*,?) használata</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetű érzékeny</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Levél</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>QT-Mail preferálása</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Opie-Mail preferálása</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Megjegyzés: A QT-Mail program
 csak a SHARP alapértelmezett
 ROM-jában található. Az Opie-Mail
 ingyenesen elérhető !</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Keresési beállítások</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Betűk</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Kicsi</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Sorrend</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kapcsolatok sorrendjének kiválasztása:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Fel</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Le</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eltávolít</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Beállítás</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Rögzít mint</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Beosztás</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Város</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Állam</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Ország</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Teljes név...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Szervezet</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Jegyzetek...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthoni</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Irányítószám</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Egyesült Államok</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Egyesült Királyság</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japán</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Franciaország</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Németország</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvégia</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Jegyzet beírása</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Név szerkesztése</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albánia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikai Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentína</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Ausztrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Ausztria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbajdzsán</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamák</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Banglades</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbadosz</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarusszia</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgium</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bután</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botszvána</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Sziget</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazília</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundia</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodzsa</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmán Szigetek</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Csile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kína</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Karácsony Szigetek</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kolumbia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Komorosz</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongó</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Szigetek</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Horvátország</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Ciprus</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Csehország</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dánia</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominika</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikai Köztársaság</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Kelet Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekvádor</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egyiptom</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Egyenlítői Ginea</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Észtország</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Szigetek</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroe Szigetek</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finnország</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Francia Gajana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Francia Polinézia</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltár</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Görögország</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Greenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Ginea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Magyarország</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Iceland</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonézia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Írország</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Olaszország</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordánia</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazahsztán</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Lettország</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litvánia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Makaó</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedónia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaszkár</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malájzia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldives</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Málta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritánia</translation>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index ee084a6..ed7af0f 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -1,304 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</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>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
+It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/appskey.ts b/i18n/hu/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/hu/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/aqpkg.ts b/i18n/hu/aqpkg.ts
index 348cc10..6db6ebe 100644
--- a/i18n/hu/aqpkg.ts
+++ b/i18n/hu/aqpkg.ts
@@ -1,546 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/backgammon.ts b/i18n/hu/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/hu/backgammon.ts
+++ b/i18n/hu/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/backup.ts b/i18n/hu/backup.ts
index 02b6cc2..e90fc17 100644
--- a/i18n/hu/backup.ts
+++ b/i18n/hu/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/bounce.ts b/i18n/hu/bounce.ts
index 9d2d3d1..4a3035b 100644
--- a/i18n/hu/bounce.ts
+++ b/i18n/hu/bounce.ts
@@ -1,100 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/calibrate.ts b/i18n/hu/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/hu/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index 77b4422..b726534 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/clock.ts b/i18n/hu/clock.ts
index bb769ee..987533a 100644
--- a/i18n/hu/clock.ts
+++ b/i18n/hu/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Szundít</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Óra</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Stopper</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Indulj</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Alaphelyzet</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Ébresztés beállítása</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Állj</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>DU</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Ébresztés bekapcsolva</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Ébresztés kikapcsolva</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Dátum és idő beállítása.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Óra: az ébresztést elmulasztotta.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Ébresztés beállítása</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Óra</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Perc</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>DE</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>DU</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Szundítási késleltetés
 (perc)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>mp3 ébresztés</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 2e2ba64..8e7308c 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -1,810 +1,802 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>HétLista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Az esemény hossza potenciálisan hosszabb
 mint az ismétlődések közötti idő.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizáció folyik</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Esemény szerkesztése</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>perc)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>A naptár nem tudta elmenteni
 a változtatásokat.
 Szabadítson fel némi helyet és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Ismeretlen)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Hiba!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Javítsd ki</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Folytat</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>H</translation>
     </message>
     <message>
         <source>T</source>
         <translation>K / Cs</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Sz</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sz / V</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Szerde</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Vasárnap</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vége</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 Du</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 De</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">Naptár</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Események mutatásának kezdete</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Kezdő idő:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ébresztő beállítások</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Előre beállított ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Sor stílus:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Alapértelmezett</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Közepes</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Nagy</translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Hét</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Hónap</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nem</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Kezdet</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">Otthon</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>H: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation>H</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation>K</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation>Sze</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation>Cs</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation>P</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation>Szo</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation>V</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ismétlés...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Napi...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Heti...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Havi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Évi...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Kezdő időpont</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Végső időpont</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Új esemény</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Találkozó</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ebéd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vacsora</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Utazás</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthon</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>02 Jan 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Kezdő időpont</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Egész nap</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Időzóna</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Csendes</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hangos</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ismétlés</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Leírás</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Kezdet - Vég</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Jegyzet...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Jegyzet szerkesztése</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ebéd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vég</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 minden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1-n minden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1-n minden</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>szerda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>vasárnap</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Nincs ismétlés</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ismétlés rendszere</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>év</translation>
     </message>
     <message>
         <source>days</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>week</source>
         <translation>hét</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source> and </source>
         <translation>és</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 és</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, és</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Nincs vége</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ismétlés a hét ezen napjain:</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>HétVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>years</source>
         <translation>év</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/drawpad.ts b/i18n/hu/drawpad.ts
index 0e3ea96..86e7861 100644
--- a/i18n/hu/drawpad.ts
+++ b/i18n/hu/drawpad.ts
@@ -1,435 +1,443 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/euroconv.ts b/i18n/hu/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/hu/euroconv.ts
+++ b/i18n/hu/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/filebrowser.ts b/i18n/hu/filebrowser.ts
deleted file mode 100644
index aff9a16..0000000
--- a/i18n/hu/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/formatter.ts b/i18n/hu/formatter.ts
index 751e732..b1fd5b4 100644
--- a/i18n/hu/formatter.ts
+++ b/i18n/hu/formatter.ts
@@ -1,161 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
+        <source>Card mount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card mount failed!</source>
+        <source>You can now close the output window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
+        <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You can now close the output window.</source>
+        <source>Total: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal</source>
+        <source>Used: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage Type : </source>
+        <source>Available: %1 kB ( %d mB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
+        <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available: %1 kB ( %d mB)</source>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/helpbrowser.ts b/i18n/hu/helpbrowser.ts
index 4951556..81e4b05 100644
--- a/i18n/hu/helpbrowser.ts
+++ b/i18n/hu/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
+        <source>Go</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/kpacman.ts b/i18n/hu/kpacman.ts
index fb73268..7546bd0 100644
--- a/i18n/hu/kpacman.ts
+++ b/i18n/hu/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/launchersettings.ts b/i18n/hu/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/hu/launchersettings.ts
+++ b/i18n/hu/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sfcave-sdl.ts b/i18n/hu/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/es/sfcave-sdl.ts
+++ b/i18n/hu/lib.ts
diff --git a/i18n/hu/libbatteryapplet-ipaq.ts b/i18n/hu/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/hu/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libclockapplet.ts b/i18n/hu/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/hu/libclockapplet.ts
+++ b/i18n/hu/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/hu/libdialup.ts b/i18n/hu/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/hu/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libflatstyle.ts b/i18n/hu/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/hu/libflatstyle.ts
+++ b/i18n/hu/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libinterfaces.ts b/i18n/hu/libinterfaces.ts
index 407ea1f..8239ed9 100644
--- a/i18n/hu/libinterfaces.ts
+++ b/i18n/hu/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libkeyview.ts b/i18n/hu/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/hu/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libkppp.ts b/i18n/hu/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/hu/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/liblan.ts b/i18n/hu/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/hu/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libmail.ts b/i18n/hu/libmail.ts
index f13e280..78c7198 100644
--- a/i18n/hu/libmail.ts
+++ b/i18n/hu/libmail.ts
@@ -1,15 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MailFactory</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SmtpHandler</name>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
     <message>
-        <source>Form1</source>
+        <source>Looking up host...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The server refused the connection.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Host lookup failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The read from the socket failed for an unknown reason.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The sending failed for an unknown reason.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Host found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP &gt; %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; EHLO *</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; AUTH CRAM-MD5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; Authenticating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; HELO *</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; MAIL FROM: *</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; RCPT TO: *</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; DATA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; Sending data...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP&gt; QUIT (Done)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP &lt; %3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libfreetypefactory.ts b/i18n/hu/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/fr/libfreetypefactory.ts
+++ b/i18n/hu/libmodplugin.ts
diff --git a/i18n/hu/libnetmonapplet.ts b/i18n/hu/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/hu/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libopie.ts b/i18n/hu/libopie.ts
index 38912a4..505b8b1 100644
--- a/i18n/hu/libopie.ts
+++ b/i18n/hu/libopie.ts
@@ -1,108 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>Ismétlődő esemény</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Nap</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Hét</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Hónap</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Év</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Minden:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Gyakoriság</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Vége:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Nincs végső dátum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ismétlés</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>HétVar</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished">Nincs végső dátum</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished">Ismétlés</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Hé</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Ke</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Sze</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Csü</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Pé</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Szo</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Va</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Nap</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">Minden</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Válasszon időt:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">Minden</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libopieobex.ts b/i18n/hu/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/hu/libopieobex.ts
+++ b/i18n/hu/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index aa8a341..1466f1d 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -1,897 +1,955 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(több.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Üzleti</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Személyes</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Több.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Új kategória</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Új kategória</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Kategória szerkesztése</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategóriák</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Alkalmazás</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Ide jönnek a kategóriák</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globális</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Válassza ki a kategóriákat melyekhez ez a dokumentum tartozik.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Ide írja be az új kategóriát. Nyomja meg a &lt;b&gt;Hozzáad&gt; gombot a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Írja be az új kategóriát baloldalra és nyomja meg a listába illesztéshez.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Nyomja meg a kijelölt kategória törléséhez.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Ikszelje be, hogy a tulajdonság elérhető legyen minden alkalmazásnak.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sajnálom, de egy másik alkalmazás
 már szerkeszti a kategóriákat.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Kategóriák szerkesztése</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Január mutatása a kiválasztott évben</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Előző hónap mutatása</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Következő hónap mutatása</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>December mutatása a kiválasztott évben</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fájlválasztó lezárása</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Jelen típusú dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Ebben a kategóriában lévő dokumentumok mutatása</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Bökjön a listából kiválasztani kívánt dokumentumra</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, vagy válassza az &lt;b&gt;Új Dokumentum&lt;b&gt;ot új létrehozásához.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Bökjön és tartsa a dokumentum tulajdonságaihoz.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Név</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Keres</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Szöveg nem található.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Végére értem, kezdem előről</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Mit keressen:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Keresés indulása innen:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Kis- és nagybetűérzékeny</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Keresés visszafelé</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Fájl törlése sikertelen.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Másolata ennek</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikál</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Fájl másolás sikertelen.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Dokumentum mozgatása sikertelen.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Tulajdonságok</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Részletek</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Megjegyzés:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Név:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Hely:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Gyorindítás (memóriát fogyaszt)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Másol</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>A dokumentumot tároló média.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ennek a dokumentumnak a neve.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Az alkalmazás előtöltése, hogy azonnal elérhető legyen.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Jelen dokumentum törlése.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Jelen dokumentum másolása.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Jelen dokumentum átsugárzása másik eszközre.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Egyedi forgatás használata</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Tulajdonos adatai</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Rendben</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Adja meg a kódot</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jelen program beállítási adatainak
 elkészítésekor hiba történt.
 
 Kérem szabadítson fel némi helyet
 és próbálja meg újra.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nem tudom az induló fájlokat létrehozni
 Kérem szabadítson fel némi helyet
 mielőtt adatokat vinne be</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nem tudom az ébresztést beütemezni.
 Szabadítson fel némi memóriát és próbálja újra.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>N</translation>
     </message>
     <message>
         <source>M</source>
         <translation>H</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>É</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
         <source>year</source>
         <translation>év</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>Du</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Hé</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ke</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sze</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Csü</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Biztosan törli
+        <translation type="obsolete">Biztosan törli
 %1-t?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Munkahely címe:&lt;b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Lakás címe:&lt;b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>E-mail címe:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Lakás telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Lakás fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Lakás mobil:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Lakás weblap:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Üzleti weblap:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Iroda:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Üzleti telefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Üzleti fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Üzleti mobil:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Üzleti személyhívó:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Szakma:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Titkár:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Férfi</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Nő</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Nem:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Hitves:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Születésnap:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Évforduló:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Becenév:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Megszólítás</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toldalék</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Tárolás így</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Munka megnevezése</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Osztály</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Cég</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Üzleti telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Üzleti fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Üzleti mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Alapértelmezett e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mailek</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Lakás telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Lakás fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Lakás mobil</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Üzleti cím (utca)</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Üzleti cím (város)</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Üzleti cím (állam)</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Üzleti cím (irányítószám)</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Üzleti cím (ország)</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Üzleti személyhívó</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Üzleti weblap</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Szakma</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Titkár</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Lakás cím (utca)</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Lakás cím (város)</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Lakás cím (állam)</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Lakás cím (irányítószám)</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Lakás cím (ország)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Lakás weblap</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Hitves</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Évforduló</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Becenév</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Gyerekek</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Új dokumentum</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation>%1 dokumentum</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished">Bökjön ide, hogy mozgathatóvá tegye ezt az ablakot.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;Ehhez az alkalmazáshoz nincs átfogó súgó, azonban összefüggés-érzékeny van.&lt;p&gt;Az összefüggés-érzékeny súgó használatához:&lt;p&gt;&lt;ol&gt;&lt;li&gt;bökjün a súgó gombra és tartsa.&lt;li&gt;amikor a &lt;b&gt;Mi ez...&lt;/b&gt; cím megjelenik, bökjön bármely vezérlőre.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+        <translation type="unfinished">&lt;Qt&gt;Ehhez az alkalmazáshoz nincs átfogó súgó, azonban összefüggés-érzékeny van.&lt;p&gt;Az összefüggés-érzékeny súgó használatához:&lt;p&gt;&lt;ol&gt;&lt;li&gt;bökjün a súgó gombra és tartsa.&lt;li&gt;amikor a &lt;b&gt;Mi ez...&lt;/b&gt; cím megjelenik, bökjön bármely vezérlőre.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>Mi ez...</translation>
+        <translation type="unfinished">Mi ez...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation>Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation>Bökjön ide jelen ablak bezárásához.</translation>
+        <source>Jan</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation>Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
+        <source>Feb</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation>Bökjön ide, hogy mozgathatóvá tegye ezt az ablakot.</translation>
+        <source>Mar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation>Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 dokumentum</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kártya</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kártya</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI merevlemez</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Belső tároló</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Belső memória</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kártya</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>városidő futtatható állomány nem található</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Ahhoz, hogy az időzónákat kiválassza,
 kérem telepítse fel a városidő (citytime) programot.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nem tudom az ébresztést beütemezni.
 Szabadítson fel némi memóriát és próbálja újra</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fájl</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Mind a %1 fájl</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Minden fájl</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libsdmonapplet.ts b/i18n/hu/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/hu/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/libtodayaddressbookplugin.ts b/i18n/hu/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/hu/libtodayaddressbookplugin.ts
+++ b/i18n/hu/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libtodaydatebookplugin.ts b/i18n/hu/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/hu/libtodaydatebookplugin.ts
+++ b/i18n/hu/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libtodaytodolistplugin.ts b/i18n/hu/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/hu/libtodaytodolistplugin.ts
+++ b/i18n/hu/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/fr/libmpeg3plugin.ts b/i18n/hu/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/fr/libmpeg3plugin.ts
+++ b/i18n/hu/libtremorplugin.ts
diff --git a/i18n/hu/libwlan.ts b/i18n/hu/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/hu/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libwlanplugin.ts b/i18n/hu/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/hu/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/liquid-settings.ts b/i18n/hu/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/hu/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/mailit.ts b/i18n/hu/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/hu/mailit.ts
+++ b/i18n/hu/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/mediummount.ts b/i18n/hu/mediummount.ts
index 896ec3d..8f647e3 100644
--- a/i18n/hu/mediummount.ts
+++ b/i18n/hu/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/hu/mobilemsg.ts b/i18n/hu/mobilemsg.ts
deleted file mode 100644
index 44aba0b..0000000
--- a/i18n/hu/mobilemsg.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Messages: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/mpegplayer.ts b/i18n/hu/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/hu/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/netsetup.ts b/i18n/hu/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/hu/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/networksettings.ts b/i18n/hu/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/hu/networksettings.ts
+++ b/i18n/hu/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/odict.ts b/i18n/hu/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/hu/odict.ts
+++ b/i18n/hu/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/oipkg.ts b/i18n/hu/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/hu/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/opie-console.ts b/i18n/hu/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/hu/opie-console.ts
+++ b/i18n/hu/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/opie-login.ts b/i18n/hu/opie-login.ts
index 593aa78..4c5fbbd 100644
--- a/i18n/hu/opie-login.ts
+++ b/i18n/hu/opie-login.ts
@@ -1,87 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>A képernyő kalibrálásához érintse
 meg pontosan és határozottan a
 kereszteket a képernyőn.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Üdvözli Önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Belépés</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Az OPIE üdvözli önt&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Felhasználó</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Felfüggeszt</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Újraindít</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Kilép</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%2 %1&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Hibás jelszó</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A megadott jelszó helytelen.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>Az OPIE egy kezeletlen
+        <translation type="obsolete">Az OPIE egy kezeletlen
 jelzés (%1)
 miatt megállt</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>Nem sikerült az OPIE-t elindítani.</translation>
+        <translation type="obsolete">Nem sikerült az OPIE-t elindítani.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Nem sikerült átváltani az új felhasználóra</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/opie-sheet.ts b/i18n/hu/opie-sheet.ts
deleted file mode 100644
index 322b113..0000000
--- a/i18n/hu/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/opieirc.ts b/i18n/hu/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/hu/opieirc.ts
+++ b/i18n/hu/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/opiemail.ts b/i18n/hu/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/hu/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/opieplayer.ts b/i18n/hu/opieplayer.ts
index b8f82ba..b142db6 100644
--- a/i18n/hu/opieplayer.ts
+++ b/i18n/hu/opieplayer.ts
@@ -1,268 +1,258 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/opieplayer2.ts b/i18n/hu/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/hu/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/opierec.ts b/i18n/hu/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/hu/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/osearch.ts b/i18n/hu/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/hu/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/patience.ts b/i18n/hu/patience.ts
index 028b87e..473c0f2 100644
--- a/i18n/hu/patience.ts
+++ b/i18n/hu/patience.ts
@@ -1,73 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
+        <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Snap To Position</source>
+        <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Play</source>
+        <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
+        <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Snap To Position</source>
+        <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn One Card</source>
+        <source>&amp;Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>&amp;Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
+        <source>Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chicane</source>
+        <source>Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Harp</source>
+        <source>Turn one card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Teeclub</source>
+        <source>Turn three cards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/qpdf.ts b/i18n/hu/qpdf.ts
index 2f03c32..828cbdf 100644
--- a/i18n/hu/qpdf.ts
+++ b/i18n/hu/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>50%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>75%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>125%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>150%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist !</source>
+        <source>File does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index afeaff9..b82efbe 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,257 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Üdvözli önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Dokumentumok</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listanézet</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>Az elem kezd kimerülni.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>névjegykártya</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Információ</translation>
+        <translation type="unfinished">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
+        <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Elem állapot</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Dokumentum nézet</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Hang</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Videó</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Csatold az alkalmazásokat</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Keresés korlátozása a könyvtárra: (még nem használt)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hozzáad</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Elem állapot</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Leállítás</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Szinkronizációs kapcsolat</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Megtagad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Engedélyez</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Szinkronizálás</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Címlista&lt;b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Mégsem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/reader.ts b/i18n/hu/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/hu/reader.ts
+++ b/i18n/hu/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/rotation.ts b/i18n/hu/rotation.ts
deleted file mode 100644
index 1433f8c..0000000
--- a/i18n/hu/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Forgatás beállításai</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Válasszon a baloldali tájolási opciókból.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>Automatikusan újraindúljon az Opie?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;Az elforgatás nincs bekacsolva ebben a demóban, azonban ez egy támogatott képesség a Qt/Beágyazottban.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index e7b76f9..57461fe 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,105 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/snake.ts b/i18n/hu/snake.ts
index d9d6107..1a1e3e6 100644
--- a/i18n/hu/snake.ts
+++ b/i18n/hu/snake.ts
@@ -1,40 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/spreadsheet.ts b/i18n/hu/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/hu/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/hu/stockticker.ts b/i18n/hu/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/hu/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/sysinfo.ts b/i18n/hu/sysinfo.ts
index 7f14b04..32cdb58 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -1,315 +1,299 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished">CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Compact Flash memóriakártyán.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished">Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi tárhely van felhasználva ezen merevlemezen.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished">SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Secure Digital memóriakártyán.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished">SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished">In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva a beépített (Flash) memóriából ezen az kéziszámítógépen.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished">RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished">Ez a grafikon jelképezi, hogy mennyi memória van felhasználva az ideiglenes RAM diszken.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Alkalmazás CPU használat (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Rendszer CPU használat (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Átmeneti tár (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gyorsítótár (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Szabad (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Teljes memória: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Ez a lap megmutatja, a memória (azaz RAM) hogyan van felosztva az ön kéziszámítógépében.
 A memória az alábbiak szerint van kategoruzálva:
 
 1. Felhasznált - az Opie és más futó alkalmazások által felhasznált memória.
 2. Átmeneti tár - ideiglenes tároló a teljesítmény növeléséhez.
 3. Gyorsítótár - nemrég használt, de még fel nem szabadított információk.
 4. Szabad - az Opie vagy más futó alkalmazás által fel nem használt memória.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Használat#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Használja</translation>
+        <translation type="obsolete">Használja</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ez a lista a kernelbe jelenleg betöltött modulokat mutatja.
 
 Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modulról vagy eltávolítsa azt.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Válasszon ki itt egy parancsot és bökjön a jobboldali Küld gombra, hogy a parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Bökjön ide, hogy a kiválasztott parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ez a terület részletes információkat mutat erről a modulról.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>Tényleg futtatni akarja
+        <translation type="obsolete">Tényleg futtatni akarja
 </translation>
     </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Elérhető (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>:%1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Parancs</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ez kéziszámítógépen futó processzek listája.
 
 Bökjön a processzre és tartsa, hogy további információkat kapjon a processzről, vagy jelzést küldjön annak.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Válasszon egy jelzést itt, majd bökjön a jobboldali Küld gombra, hogy elküldje a processznek.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Bökjön ide, hogy elküldje a kiválasztott jelzést ennek a processznek.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ez a terület részletes információkat mutat erről a processzről.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>Biztosan küldeni akar
+        <translation type="obsolete">Biztosan küldeni akar
 </translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>CF kártya:</translation>
-    </message>
     <message>
-        <source>Hard Disk </source>
-        <translation>Merevlemez</translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>SD kártya</translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>Merevlemez /dev/hd</translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>SCSI merevlemez /dev/sd</translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>Belső tároló</translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Compact Flash memóriakártyán.</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>Ez a grafikon jelképezi, hogy mennyi tárhely van felhasználva ezen merevlemezen.</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>Ez a grafikon jelképezi, hogy mennyi memória van felhasználva ezen a Secure Digital memóriakártyán.</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>In</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>Ez a grafikon jelképezi, hogy mennyi memória van felhasználva a beépített (Flash) memóriából ezen az kéziszámítógépen.</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>RAM diszk</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>Ez a grafikon jelképezi, hogy mennyi memória van felhasználva az ideiglenes RAM diszken.</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Rendszer Információ</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Tároló</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processzek</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modulok</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Fordította:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Magyar fordítás: Czakó Krisztián (slapic@linux.co.hu)
 &lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Készült:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;Modell:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;Gyártó:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Ez a lap mutatja a gépen futó Opie, a Linux Kernel és a disztribúció verzióit.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/systemtime.ts b/i18n/hu/systemtime.ts
index 1f04908..48a20cb 100644
--- a/i18n/hu/systemtime.ts
+++ b/i18n/hu/systemtime.ts
@@ -1,328 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished">Időformátum</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished">óó:pp</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished">N/H óó:pp</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished">H/N óó:pp</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished">12/24 órás</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished">24 órás</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished">12 órás</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished">Dátumformátum</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished">A hét kezdőnapja</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished">Vasárnap</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished">Hétfő</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Időzóna</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dátum</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Időformátum</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 órás</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 órás</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">A hét kezdőnapja</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Vasárnap</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Hétfő</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Dátumformátum</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Kisalkalmazás formátum</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">óó:pp</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">N/H óó:pp</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">H/N óó:pp</translation>
-    </message>
-    <message>
-        <source>Set System Time</source>
-        <translation type="obsolete">Rendszeridő beállítása</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Óra</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Perc</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">De</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">Du</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished">Óra</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished">Perc</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">De</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">Du</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Dátum</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/tetrix.ts b/i18n/hu/tetrix.ts
index 4916eef..4f7b960 100644
--- a/i18n/hu/tetrix.ts
+++ b/i18n/hu/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/textedit.ts b/i18n/hu/textedit.ts
index 86ab013..f6a71b7 100644
--- a/i18n/hu/textedit.ts
+++ b/i18n/hu/textedit.ts
@@ -1,264 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</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>Save As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/tictac.ts b/i18n/hu/tictac.ts
index 1e4a751..f8eccb8 100644
--- a/i18n/hu/tictac.ts
+++ b/i18n/hu/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/tinykate.ts b/i18n/hu/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/hu/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 6dd313a..31646ac 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,119 +1,182 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Owned by </source>
-        <translation>Tulajdonos:</translation>
+        <translation type="unfinished">Tulajdonos:</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Kérem töltse ki a névjegyét</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nem találtam kiegészítőt</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nincs aktivált kiegészítő</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Bökjön ide a hozzárendelt program indításához</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Készítette Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Bökjön ide a beállításhoz</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Ma beállítása</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Mely kiegészítő milyen sorrendben töltödjön be:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mozgasd fel</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mozgasd le</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktív/sorrend</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Ébresztéskor
+        <translation type="obsolete">Ébresztéskor
 automatikusan induljon?
 (Csak Opie esetén)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>perc iniaktivitás</translation>
+        <translation type="obsolete">perc iniaktivitás</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
+        <translation type="obsolete">Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Hány percig kell a PDA-nak felfüggesztve lennie mielőtt az automatikus indítás létrejön bekapcsoláskor</translation>
+        <translation type="obsolete">Hány percig kell a PDA-nak felfüggesztve lennie mielőtt az automatikus indítás létrejön bekapcsoláskor</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Ikon méret</translation>
+        <translation type="obsolete">Ikon méret</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Az ikon méretét állítja be pixelben</translation>
+        <translation type="obsolete">Az ikon méretét állítja be pixelben</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Frissítés</translation>
+        <translation type="obsolete">Frissítés</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Milyen gyakran frissítse a Ma önmagát</translation>
+        <translation type="obsolete">Milyen gyakran frissítse a Ma önmagát</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>másodperc</translation>
+        <translation type="obsolete">másodperc</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>soha</translation>
+        <translation type="obsolete">soha</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>Ikszelje be a négyzetet a kiegészítő aktiválásához vagy használja a jobboldali nyilakat a sorrend beállításához</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished">Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished">Hány percig kell a PDA-nak felfüggesztve lennie mielőtt az automatikus indítás létrejön bekapcsoláskor</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished">perc iniaktivitás</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished">Az ikon méretét állítja be pixelben</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">másodperc</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished">soha</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished">Milyen gyakran frissítse a Ma önmagát</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 2f44490..806bcc7 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,586 +1,620 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation>Ébresztők</translation>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Emlékeztetők</translation>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Alarms</source>
+        <translation>Ébresztők</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>Információ</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Ismétlődés</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Feladat bevitele</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Feladat szerkesztése</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation type="unfinished">Új sablonból</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Új feladat</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation type="unfinished">Bökjön ide új feladat létrehozásához.</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Feladat szerkesztése</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation type="unfinished">Bökjön ide az aktuális feladat módosításához.</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished">Feladat megnézése</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished">Töröl...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation type="unfinished">Bökjön ide az aktuális feladat eltávolításához.</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished">Mindent töröl...</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished">Elvégzettek törlése</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Átsugárzás</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation type="unfinished">Bökjön ide az aktuális felada másik eszköznek küldéséhez.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Keresés</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation type="unfinished">Mutasd az elvégzett feladatokat</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished">Csak a lejárt feladatokat mutasd</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished">Mutasd a feladatok határidejét</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished">Mutasd a gyors feladatcsíkot</translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished">Adat</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Kategória</translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished">Beállítások</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished">GyorsSzerkesztés</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished">Ez az összes aktuális feladat listája.
 
 A lista az alábbi információkat tartalmazza:
 1. Teljesített -  Egy zöld pipa jelzi a feladat teljesítését. Bökjön ide, ha teljesítette a feladatot.
 2. Fontosság - grafikus megjelenítése a feladat fontosságának. Duplán bökjön ide a módosításhoz.
 3. Leírás - a feladat leírása. Bökjön ide a feladat kiválasztásához.
 4. Határidő - megmutatja mikorra kell készlegyen a feladattal. Ez az oszlop mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a feladatok határidejét&apos; kiválasztásával a fenti menüből.</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Minden kategória</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Nincs hely</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">A Teendők nem tudta elmenteni
 a változásokat.
 Szabaditson fel némi helyet
 és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Teendők</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">Az adat nem szerkeszthető, szinkronizáció folyamatban</translation>
+        <translation type="obsolete">Az adat nem szerkeszthető, szinkronizáció folyamatban</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished">minden feladat?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished">minden elvégzett feladat?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Iktatatlan</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished">&lt;P&gt;%1 új feladat érkezett.&lt;p&gt;Szeretné hozzáadni a Teendőkhöz?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished">Új feladatok</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupláz</translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">T.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished">Fontosság</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Leírás</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Határidő</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished">Sablonok beállítása</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished">Fontosság:</translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished">Sablon szerkesztő</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished">Hozzáad</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Szerkeszt</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Eltávolít</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Név</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished">új sablon %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished">Bökjön ide az új feladat fontosságának beállításához.
+
+Ezt a területet gyors feladatcsíknak hívjuk.
+
+Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished">Írja be az új feladat leírását ide.
+
+Ezt a területet gyors feladatcsíknak hívjuk.
+
+Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished">Több</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished">Bökjön ide, hogy beírjon kiegészítő információkat az új feladathoz.
+
+Ezt a területet gyors feladatcsíknak hívjuk.
+
+Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished">Bevisz</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished">Bökjön ide új feladat hozzáadásához.
+
+Ezt a területet gyors feladatcsíknak hívjuk.
+
+Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Mégsem</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished">Bökjön ide az új feladat információk alaphelyzetbe hozásához.
+
+Ezt a területet gyors feladatcsíknak hívjuk.
+
+Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tábla nézet</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 nap</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Leírás:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>Írja be a feladat rövid leírását ide.</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>Teljesítsd a</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>Dolgozz a</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>Vegyél</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>Szervezd a</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>Szerezz be</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>Frissítsd a</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>Készíts</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>Tervezz</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>Hívd fel</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>Írj levelet</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>Válassza ki a feladat fontosságát itt.</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>Nagyon fontos</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Fontos</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normál</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Alacsony</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Nagyon alacsony</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategória:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>Válassza ki a kategóriát, melyhez a feladat tartozik.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Ismétlődő feladat</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Bökjön ide, ha a feladat rendszeresen esedékes. Ha kiválasztja, a rendszerességet beállíthatja a Rendszeresség fülön.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Jegyzetek:</translation>
+        <translation type="obsolete">Jegyzetek:</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Írjon be bármi kiegészítő információt a feladatról ide.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Teendők listája</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Állapot:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Bökjön ide, hogy beállítsa a jelenlegi feladat állapotát.</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>Elkezdve</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>Elhalasztva</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>Befejezve</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>Nincs elkezdve</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Haladás:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>Válassza ki a feladat előrehaladtát itt.</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>Kezdőnap:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>Bökjön ide, hogy beállítsa mely napon kezdődött ez a feladat.</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>Határidő:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>Bökjön ide, hogy beállítsa mikorra kellene a feladatnak elkészülnie.</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>Teljesítve:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>Bökjön ide, hogy a feladatot teljesítettnek jelölje.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>Bökjön ide, hogy beállíthassa mikor teljesítette a feladatot.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>Karbantartó mód:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>Bökjön ide, hogy beállítsa a karbantartó szerepét.</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>Semmi</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>Felelős</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>Elvégezte</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>Koordinálja</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>Karbantartó:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>Ez a jelenlegi feladat karbantartójának neve.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>próba</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Bökjön ide, hogy beállítsa a feladat karbantartóját.</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation>Sablon szerkesztő</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Hozzáad</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Szerkeszt</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Eltávolít</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation>Név</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation>új sablon %1</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Bökjön ide az új feladat fontosságának beállításához.
-
-Ezt a területet gyors feladatcsíknak hívjuk.
-
-Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Írja be az új feladat leírását ide.
-
-Ezt a területet gyors feladatcsíknak hívjuk.
-
-Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
-    </message>
-    <message>
-        <source>More</source>
-        <translation>Több</translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Bökjön ide, hogy beírjon kiegészítő információkat az új feladathoz.
-
-Ezt a területet gyors feladatcsíknak hívjuk.
-
-Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation>Bevisz</translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Bökjön ide új feladat hozzáadásához.
-
-Ezt a területet gyors feladatcsíknak hívjuk.
-
-Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Mégsem</translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>Bökjön ide az új feladat információk alaphelyzetbe hozásához.
-
-Ezt a területet gyors feladatcsíknak hívjuk.
-
-Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/hu/ubrowser.ts b/i18n/hu/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/hu/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/usermanager.ts b/i18n/hu/usermanager.ts
index 282a43f..28f3895 100644
--- a/i18n/hu/usermanager.ts
+++ b/i18n/hu/usermanager.ts
@@ -1,31 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
+        <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/wellenreiter.ts b/i18n/hu/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/hu/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/hu/wlansetup.ts b/i18n/hu/wlansetup.ts
deleted file mode 100644
index 92237a7..0000000
--- a/i18n/hu/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation>Vezetéknélküli LAN beállítások</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation>ESS ID</translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation>Nem rögzített ESSID: &quot;BÁRMI&quot;</translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation>Rögzített ESSID</translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation>Hálózat típusa</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation>Infrastruktúra</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Csatorna</translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation>802.11 Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation>Wep</translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation>Kulcs beállítások</translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation>Kulcs 1</translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation>Kulcs 2</translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation>Kulcs 3</translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation>Kulcs 4</translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation>Kulcshossz</translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation>40 bites</translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation>128 bites</translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation>Azonosítás típusa</translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation>Nyílt rendszer</translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation>Osztott kulcs</translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation>Web bekapcsolása</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/.directory b/i18n/it/.directory
index cdd16ea..d50b7bd 100644
--- a/i18n/it/.directory
+++ b/i18n/it/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Italian
 Name[da]=Italiensk
 Name[es]=Italiano
 Name[it]=Italiano
 Name[pt]=Italiano
 Name[pt_BR]=Italiano
 Name[sl]=Italijanščina
+Name[de]=Italienisch
+Name[nl]=Italiaans
\ No newline at end of file
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index e728050..24ae164 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -1,1051 +1,1050 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contatto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Scelta</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contatto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Scrivi Email A</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importa vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Informazioni Personali</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Modifica Dati Personali</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Modifica Dati</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatti - Dati Personali</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare i dati.
 Liberare dello spazio
 e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartellini</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Salva tutti i Dati</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Non Trovato</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Cartellino</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Inizia Ricerca</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Giusto tipo di file?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sì</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>Impossibile trovare un contatto con questo 
  criterio di ricerca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Il nome del file selezionato 
  non termina con &quot;.vcf&quot;.
  Vuoi veramente aprirlo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Aggiungi Contatto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Vuoi veramente aggiungere un contatto per 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Tutti Sì</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Esporta vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Devi selezionare un contatto !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Devi impostare un nome file !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stile Ricerca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Usa Espressioni Regolari</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Usa Wildcards (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Email</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Scegli QT-Mail </translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Scegli Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Nota: QT-Mail è inserito 
 nella ROM della SHARP. 
 Opie-Mail viene invece
 rilasciato gratuitamente!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Impostazioni Ricerca</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordine</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Seleziona Ordine Visualizzazione:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
-        <translation>Clicca sul tab per selezionarne uno</translation>
+        <translation>Premi sul tab per selezionarne uno</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Impostazioni per lo stile della ricerca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Il widget Cerca si aspetta, se selezionate, espressioni regolari</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Il widget Cerca si aspetta solo semplici wildcards</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Se selezionato, cerca differenze tra caratteri in minuscolo e maiuscolo</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Dimensione Font size per vista della lista e della card</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Impostazioni Font per vista della lista e della card</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Utilizza il client mail della Sharp se disponibile</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Utilizza il client mail di OPIE se installato</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Sposta l&apos;attributo selezionato una riga sopra</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Sposta l&apos;attributo selezionato una riga sotto</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Mostra tutti gli attributi disponibili</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Aggiungi l&apos;attributo selezionato dalla lista inferiore alla lista di superiore</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Elimina l&apos;attributo selezionato dalla lista superiore</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Ordine (sopra -&gt; sotto) definisce la visualizzazione dei contatti principali nella seconda colonna della vista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Tool-/Menubar</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fisso</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar fissi dopo aver riavviato l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobile</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Cambia su menu-/toolbar mobili dopo aver riavviato l&apos;applicazione !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizzazione</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Città</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>CAP</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Paese</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stati Uniti</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Regno Unito</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algeria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgio</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Island</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasile</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambogia</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Capo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Isole Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Cile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Cina</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Christmas Island</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Island</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Costa D&apos;Avorio</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croazia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cipro</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Repubblica Ceca</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danimarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Repubblica Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor East</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egitto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guinea Equatoriale</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Isole Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Isole Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlandia</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guinea Francese</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinesia Francese</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Germania</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibilterra</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grecia</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinea</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Ungheria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islanda</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israele</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italia</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Giappone</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Giordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenya</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituania</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Lussemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malaysia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldive</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Messico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesia</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marocco</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambico</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Paesi Bassi</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nuova Caledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nuova Zelandia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norvegia</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nuova Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Perù</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filippine</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polonia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portogallo</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Romania</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index a5aabc6..ea3bb64 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -1,352 +1,366 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>La directory non esiste</translation>
     </message>
     <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-copyright 2002 di
-L.J.Potter &lt;llornkcor@handhelds.org&gt;
-sotto licenza GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Esegui</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Apri come testo</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crea Directory</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Crea Link Simbolico</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Copia Come</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copia Stessa Dir</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Muovi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Aggiungi a Documenti</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Esegui Comando</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Info File</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Imposta Permessi</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Trasmetti File via IrDA</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Esegui Comando con Output</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambia su Remoto</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="obsolete">Vuoi veramente cancellare
-</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
-        <source> already exists
-Do you really want to delete it?</source>
-        <translation type="obsolete"> già esiste
-Vuoi veramente cancellarlo?</translation>
-    </message>
-    <message>
         <source>Could not copy
 </source>
         <translation>Impossibile copiare
 </translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>to
 </translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation>Copia</translation>
+        <translation>Copia </translation>
     </message>
     <message>
         <source> As</source>
-        <translation>Come</translation>
+        <translation> Come</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Impossibile spostare
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Output AdvancedFm</translation>
     </message>
     <message>
-        <source>command failed!</source>
-        <translation type="obsolete">commando fallito!</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
         <source>Advancedfm Beam out</source>
         <translation>Trasmissione Advancedfm</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir eseguito.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 copyright 2002-2003 di
 L.J.Potter &lt;llornkcor@handhelds.org&gt;
 sotto licenza GPL</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambia Directory</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation>Impossibile eliminare la directory corrente
-dai bookmarks.
-Non è inserita nei bookmark!!</translation>
-    </message>
-    <message>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Directory Bookmark</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Elimina Directory Corrente dai Bookmarks</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Vuoi realmente cancellare
 %1 file?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Cancella Directory?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>Eliminare realmente
-</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Copiare realmente
 %1 file?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>File Esistente!</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 esiste. Ok per sovrascrivere?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Impossibile copiare %1 su %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 esiste. Ok per sovrascrivere?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> già esiste.
 Vuoi veramente eliminarlo?</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Impossibile rimuovere la directory corrente
+dai bookmark.
+Non è inserita nei bookmark!</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Cerca File</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Vuoi veramente eliminare %1
+e tutto il suo contenuto ?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>Vuoi veramente eliminare
+%1?</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salva output su file (solo nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Il processo non può essere iniziato</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Errore
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Terminato
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Imposta Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Imposta permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>proprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>altri</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Proprietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lettura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Attenzione</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Errore- nessun utente</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Errore- nessun gruppo</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Errore impostazioni proprietà utente o gruppo</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Errore impostazioni permessi</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/appearance.ts b/i18n/it/appearance.ts
index b835760..a9f58b5 100644
--- a/i18n/it/appearance.ts
+++ b/i18n/it/appearance.ts
@@ -1,286 +1,286 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Appearance</name>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Gli stili controllano il modo in cui gli elementi come i pulsanti e le barre di scorrimento appaiono in tutte le applicazioni.
 
-Clicca qui per selezionare uno stile disponibile.</translation>
+Premi qui per selezionare uno stile disponibile.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Impostazioni...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
-        <translation>Clicca qui per configurare lo stile selezionato.
+        <translation>Premi qui per configurare lo stile selezionato.
 
 Nota:  Questa opzione non è disponibile per tutti gli stili.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Le decorazioni delle finestre controllano il modo in cui la barra del titolo e i pulsanti dell&apos;applicazione appaiono.
 
-Clicca qui per selezionare una decorazione disponibile.</translation>
+Premi qui per selezionare una decorazione disponibile.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Seleziona il nome desiderato, stile e dimensione del font predefinito che le applicazioni utilizzeranno.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Gli schemi dei colori sono collezioni di colori che sono utilizzate da varie parti del display.
 
-Clicca qui per selezionare uno schema disponibile.</translation>
+Premi qui per selezionare uno schema disponibile.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Schema Corrente</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
-        <translation>Clicca qui per cambiare i colori nello schema corrente.</translation>
+        <translation>Premi qui per cambiare i colori nello schema corrente.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation>Clicca qui per eliminare lo schema dei colori selezionato dalla lista sulla sinistra.</translation>
+        <translation>Premi qui per eliminare lo schema dei colori selezionato dalla lista sulla sinistra.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
-        <translation>Clicca qui per nominare e salvare lo schema dei colori corrente.</translation>
+        <translation>Premi qui per nominare e salvare lo schema dei colori corrente.</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Forza lo stile per tutte le applicazioni.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation>Clicca qui per permettere a tutte le applicazioni di poter utilizzare le impostazioni globali.</translation>
+        <translation>Premi qui per permettere a tutte le applicazioni di poter utilizzare le impostazioni globali.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>Disabilita lo stile per queste applicazioni ( può essere utilizzato &lt;b&gt;*&lt;/b&gt; come una wildcard):</translation>
+        <translation>Disabilita lo stile per queste applicazioni (&lt;b&gt;*&lt;/b&gt; può essere utilizzato come una wildcard):</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>Se alcune applicazioni non vengono visualizzate correttamente con le impostazioni globali, si possono disabilitare alcune impostazioni per quell&apos;applicazione.
 
 Quest&apos;area permette di selezionare un&apos;applicazione e quali impostazioni si vuole disabilitare.</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>File Binari</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation>Clicca qui per aggiungere un&apos;applicazione nella lista superiore.</translation>
+        <translation>Premi qui per aggiungere un&apos;applicazione nella lista superiore.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation>Clicca qui per eliminare l&apos;applicazione selezionata.</translation>
+        <translation>Premi qui per eliminare l&apos;applicazione selezionata.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation>Clicca qui per spostare sù nella lista l&apos;applicazione selezionata.</translation>
+        <translation>Premi qui per spostare sù nella lista l&apos;applicazione selezionata.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>Clicca qui per spostare giù nella lista l&apos;applicazione selezionata.</translation>
+        <translation>Premi qui per spostare giù nella lista l&apos;applicazione selezionata.</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Stile tab:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation>Clicca qui per selezionare lo stile desiderato per le finestre di dialogo (come quest&apos;applicazione). Gli stili disponibili sono:
+        <translation>Premi qui per selezionare lo stile desiderato per le finestre di dialogo (come quest&apos;applicazione). Gli stili disponibili sono:
 
 1. Tab - tab normali solo con etichette di testo
 2. Tabs + icone - tab con icone per ogni tab, etichette di testo appaiono solo sul tab selezionato
 3. Lista verticale - una lista di tab in verticale
 4. Lista verticale + icone - una lista di tab in verticale con icone</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Tab + icone</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista verticale</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista verticale + icone</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation>Cima</translation>
+        <translation>In Alto</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
-        <translation>Clicca qui per far apparire i tab in cima alla finestra.</translation>
+        <translation>Premi qui per far apparire i tab in cima alla finestra.</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation>Fondo</translation>
+        <translation>In Basso</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation>Clicca qui per far apparire i tab in fondo alla finestra.</translation>
+        <translation>Premi qui per far apparire i tab in fondo alla finestra.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Direzione rotazione:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Impostazioni Aspetto</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Questa è un&apos;anteprima.  Controlla qui il nuovo aspetto una volta modificate le opzioni.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Finestre</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation>Vuoi riavviare %1 ora?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Salva Schema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Salva schema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schema già esistente.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Cancella schema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossibile cancellare schema corrente.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nuovo&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Modifica schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
-        <translation>Clicca qui per selezionare un colore per: </translation>
+        <translation>Premi qui per selezionare un colore per: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Esempio</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento Normale</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Elemento Disabilitato</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Testo Normale</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Testo Evidenziato</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Pulsante</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Check Box</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Finestra d&apos;esempio con le impostazioni selezionate.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/appskey.ts b/i18n/it/appskey.ts
deleted file mode 100644
index f379b26..0000000
--- a/i18n/it/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Imposta Pulsanti</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Calendario</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Rubrica</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Principale</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Menu Popup</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Posta</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/aqpkg.ts b/i18n/it/aqpkg.ts
index 88a9ff4..d660a3f 100644
--- a/i18n/it/aqpkg.ts
+++ b/i18n/it/aqpkg.ts
@@ -1,595 +1,698 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtro Categoria</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Seleziona uno o più gruppi</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lettura configurazione...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Elimina
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installa
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Upgrade
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Rinstalla)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Upgrade)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinazione</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Spazio Disp.</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
-**** L&apos;utente ha cliccato INTERROMPI ***</translation>
+**** L&apos;utente ha premuto INTERROMPI ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Processo Interrotto ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Salva output</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forza Dipendenze</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forza Rinstallazione</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forza Eliminazione</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forza Sovrascrittura</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Livello Informazioni</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Solo errori</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Messaggi normali</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Messaggi informativi</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Output troubleshooting</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>Trattamento pacchetto %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Rimozione link simbolici...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Creazione link simbolici per %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Creazione link simbolici per %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Terminato</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Rimozione valore stato...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>file di stato - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>pacchetto - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Impossibile aprire file di stato - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Impossibile creare file di stato temporaneo - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>Impossibile avviare processo ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>Impossibile aprire :</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Creazione directory </translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Creato link da %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Creazione link da %1 a %2 fallita</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>Eliminato %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Impossibile eliminare %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Eliminato </translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Impossibile eliminare </translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Gestore Pacchetti</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Inserisci qui il testo da cercare.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation>Clicca qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
+        <translation>Premi qui per nascondere la toolbar &quot;Quick Jump&quot;.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Aggiorna liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Clicca qui per aggiornare le liste dei pacchetti dai server.</translation>
+        <translation>Premi qui per aggiornare le liste dei pacchetti dai server.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation>Clicca qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
+        <translation>Premi qui per fare l&apos;upgrade di tutti i pacchetti installati se è disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation>Clicca qui per fare il download dei pacchetti selezionati.</translation>
+        <translation>Premi qui per fare il download dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Applica modifiche</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation>Clicca qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
+        <translation>Premi qui per installare, eliminare o fare l&apos;upgrade dei pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation>Mostra i pacchetti non installati</translation>
+        <translation>Mostra pacchetti non installati</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation>Clicca qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
+        <translation>Premi qui per visualizzare i pacchetti disponibili non ancora installati.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation>Mostra i pacchetti installati</translation>
+        <translation>Mostra pacchetti installati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation>Clicca qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
+        <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation>Mostra i pacchetti aggiornati</translation>
+        <translation>Mostra pacchetti aggiornati</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation>Clicca qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
+        <translation>Premi qui per visualizzare i pacchetti installati su questo dispositivo che hanno disponibile una versione più aggiornata.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filtra per categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation>Clicca qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
+        <translation>Premi qui per visualizzare i pacchetti appartenenti ad una categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Imposta filtro per categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation>Clicca qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
+        <translation>Premi qui per cambiare la categoria utilizzata per il filtro dei pacchetti.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation>Clicca qui per cercare del testo nei nomi dei pacchetti.</translation>
+        <translation>Premi qui per cercare del testo nei nomi dei pacchetti.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Trova successivo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation>Clicca qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
+        <translation>Premi qui per trovare il successivo nome del pacchetto che contiene il testo che stai cercando.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
-        <translation>Tastiera &quot;Quick Jump&quot;</translation>
+        <translation>Tastiera Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation>Clicca qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
+        <translation>Premi qui per mostrare/nascondere la tastiera per muoversi velocemente nella lista dei pacchetti.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation>Clicca qui per configurare questa applicazione.</translation>
+        <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Clicca qui per nascondere la toolbar di ricerca.</translation>
+        <translation>Premi qui per nascondere la toolbar di ricerca.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Server:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation>Clicca qui per selezionare un server per i pacchetti.</translation>
+        <translation>Premi qui per selezionare un server per i pacchetti.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pacchetti</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Questa è la lista di tutti i pacchetti del server selezionato sopra.
 
 Un punto blu dopo il nome del pacchetto indica che il pacchetto è installato.
 
 Un punto blu con una stella indica che è disponibile sul server una nuova versione del pacchetto .
 
-Clicca dentro il box sulla sinistra per selezionare un pacchetto.</translation>
+Premi dentro il box sulla sinistra per selezionare un pacchetto.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation>Clicca qui per disinstallare i pacchetti selezionati.</translation>
+        <translation>Premi qui per disinstallare i pacchetti selezionati.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista server:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Creazione lista pacchetti per:
 <byte value="x9"/>%1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Installato Su - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Descrizione - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Dimensione - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Sezione - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Nome File - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">V. Installata - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">V. Disponibile - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Aggiornamento liste pacchetti dal server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENZIONE: Fare l&apos;upgrade
 mentre Opie/Qtopia è in esecuzione
 è SCONSIGLIATO!
 
 Sei sicuro?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Aggiornamento pacchetti installati</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Sei sicuro di voler eliminare
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Sei sicuro?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Download su dove</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Inserisci path per download su</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Installa Pacchetto Remoto</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Inserisci posizione pacchetto</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Niente da fare</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nessun pacchetto selezionato</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Vuoi eliminare o rinstallare
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Elimina o Rinstalla</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Rinstalla</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vuoi eliminare o fare l&apos;upgrade di
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Elimina o Upgrade</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Aggiornamento...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Descrizione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Installato Su&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Dimensione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sezione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versione Installata&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Versione Disponibile&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informazioni Pacchetto</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informazioni pacchetto non disponibili</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Pacchetti installati</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Pacchetti locali</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/D</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Pacchetto - %1
+              versione - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+              versione inst - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>La stringa della versione è vuota.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Il valore nella versione non è un numero.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Nessun carattere dopo i due punti nel numero di versione.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Elimina</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinazioni</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxy</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Indirizzo:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Server Attivo</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Aggiorna</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Destinazione</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation>Link alla root</translation>
+        <translation>Link a /</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Abilitato</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Username:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/backgammon.ts b/i18n/it/backgammon.ts
index 4eb9e18..ed0c396 100644
--- a/i18n/it/backgammon.ts
+++ b/i18n/it/backgammon.ts
@@ -1,2 +1,171 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Recupera&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Elimina&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Esponi&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Proteggi&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Salva&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vuoto&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Valori Predefiniti</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Aiuto</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Mette i pezzi fuori dalla &quot;endzone&quot;</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Elimina un pezzo dell&apos;avversario</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Espone i tuoi pezzi.
+Dopo questa mossa solo un pezzo rimarrà nella posizione</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Protegge un singolo pezzo
+mettendone un altro in questa posizione</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Muove il pezzo in una posizione già
+occupata dal giocatore</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Muove il pezzo in una posizione vuota</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Tieni premuto il pulsante ?
+per aiuto</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuova</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Carica</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Partita</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Predefinito</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Giocatore</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>IA</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regole</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opzioni</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>cancella tema %1?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Carica Tema</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;nessuna mossa&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Il giocatore 1 ha vinto. Premi sulla scacchiera per una nuova partita.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Il giocatore 2 ha vinto. Premi sulla scacchiera per una nuova partita.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;turno G2&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;turno G1&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/backup.ts b/i18n/it/backup.ts
index 9ee050d..5b96de8 100644
--- a/i18n/it/backup.ts
+++ b/i18n/it/backup.ts
@@ -1,52 +1,118 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Backup e Restore... in corso...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup e Restore</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>Errore dal Sistema:
+</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Messaggio</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>Backup Fallito!</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Dettagli</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>Backup e Restore... Fallito !!</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Backup Eseguito.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>Seleziona qualcosa da restorare.</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>Restore Fallito.</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Impossibile aprire File: %1</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>Restore Eseguito.</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation>Backup E Restore</translation>
+        <translation>Backup e Restore</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Salva Su</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restore</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleziona Sorgente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restore</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Aggiorna Lista File</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>Info Errore</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>Messaggio di Errore:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/bounce.ts b/i18n/it/bounce.ts
index b025e24..0bb65a4 100644
--- a/i18n/it/bounce.ts
+++ b/i18n/it/bounce.ts
@@ -1,107 +1,133 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Bounce</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nuova partita</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Informazioni</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
         <source>Score: 00</source>
-        <translation>Punteggio: 00</translation>
+        <translation>Punti: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Vite: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Riempito: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Tempo: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Livello %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
-        <translation>Punteggio: %1</translation>
+        <translation>Punti: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Partita in pausa.
 Premi P per continuare!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>Partita Terminata!
-Punteggio: %1</translation>
+Punti: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Tempo: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Vite: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Riempito: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Riempito: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Liberato più del 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 punti: 15 punti per vita
 </translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 punti: Bonus
 </translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 punti: Punteggio totale
 </translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>Livello %1.
 Hai %2 vite questa volta!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>Informazioni</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Scritto da: Stefan Schimanski
+Modificato da: Martin Imobersteg
+
+Premi per creare i muri. Premi spazio
+per cambiare la direzione dei muri.
+Tenta di ridurre lo spazio totale del
+75%.
+
+Questo programma è distribuito
+sotto licenza GPL v2.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/calibrate.ts b/i18n/it/calibrate.ts
new file mode 100644
index 0000000..2cdba64
--- a/dev/null
+++ b/i18n/it/calibrate.ts
@@ -0,0 +1,16 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Tocca le crocette accuratamente e
+con decisione per calibrare lo schermo.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Benvenuto in Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index e0106c7..f715e71 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -1,521 +1,525 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nuova nota spese</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Movimenti</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafici</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Inserisci qui il nome della nota spese.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleziona qui il tipo di nota spese.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Risparmio</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Deposito</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Mercato finanziario</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Mutuo</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Altro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banca:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Inserisci qui il nome della banca per questa nota spese.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numero conto:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Inserisci qui il numero di conto per questa nota spese.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numero PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Inserisci qui il numero PIN per questa nota spese.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo iniziale:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Inserisci qui il saldo iniziale per questa nota spese.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Inserisci qui ulteriori informazioni necessarie per questa nota spese.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Quest&apos;area mostra l&apos;attuale saldo per questa nota spese.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Questa è una lista di tutti i movimenti inseriti per questa nota spese.
 
-Per ordinarla per un campo specifico, clicca sul nome della colonna.</translation>
+Per ordinarla per un campo specifico, Premi sul nome della colonna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Importo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
-        <translation>Clicca qui per aggiungere un nuovo movimento.</translation>
+        <translation>Premi qui per aggiungere un nuovo movimento.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
-        <translation>Seleziona un movimento e clicca qui per modificarlo.</translation>
+        <translation>Seleziona un movimento e Premi qui per modificarlo.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
-        <translation>Seleziona una nota spese e clicca qui per eliminarla.</translation>
+        <translation>Seleziona una nota spese e Premi qui per eliminarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation>Seleziona il grafico desiderato e clicca su bottone Disegna.</translation>
+        <translation>Seleziona il grafico desiderato e Premi sul pulsante Disegna.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
-        <translation>Clicca qui per selezionare il tipo di grafico desiderato.</translation>
+        <translation>Premi qui per selezionare il tipo di grafico desiderato.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo del conto</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Prelievi per categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depositi per categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Disegna</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
-        <translation>Clicca qui per disegnare il grafico selezionato.</translation>
+        <translation>Premi qui per disegnare il grafico selezionato.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Saldo: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Elimina movimento</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protetta da password</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation>Clicca qui per abilitare/disabilitare la protezione con password per questa nota spese.</translation>
+        <translation>Premi qui per abilitare/disabilitare la protezione con password per questa nota spese.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prego conferma la tua password:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prego inserisci la tua password per confermare l&apos;eliminazione della protezione con password:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configura Nota Spese</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Inserisci simbolo valuta:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Inserisci qui il tuo simbolo valuta.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra quando una nota spese è protetta
 da password</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation>Clicca qui per selezionare se nella finestra principale verrà o no mostrato se la nota spese è protetta da password.</translation>
+        <translation>Premi qui per selezionare se nella finestra principale verrà o no mostrato se la nota spese è protetta da password.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostra i saldi delle note spese</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation>Clicca qui per selezionare se nella finestra principale verranno o no mostrati i saldi di ogni nota spese.</translation>
+        <translation>Premi qui per selezionare se nella finestra principale verranno o no mostrati i saldi di ogni nota spese.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
-        <translation>Clicca per creare una nuova nota spese.
+        <translation>Premi per creare una nuova nota spese.
 
 Puoi anche selezionare Nuova dal menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation>Seleziona una nota spese e clicca qui per modificarla.
+        <translation>Seleziona una nota spese e Premi qui per modificarla.
 
-Puoi anche selezionare Modifica dal menu, o clicca e tieni premuto sul nome della nota spese.</translation>
+Puoi anche selezionare Modifica dal menu, o Premi e tieni premuto sul nome della nota spese.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
-        <translation>Seleziona un movimento e clicca qui per eliminarlo.
+        <translation>Seleziona un movimento e Premi qui per eliminarlo.
 
 Puoi anche selezionare Elimina dal menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Questa è la lista di tutte le note spese attualmente disponibili.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Elimina nota spese</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
-        <translation>Clicca qui per configurare questa applicazione.</translation>
+        <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome Nota Spese</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Movimento per </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Prelievo</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleziona qui se il movimento è un prelievo o un deposito.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Deposito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleziona qui la data del movimento.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numero:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Inserisci qui il numero del conto.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Inserisci qui la descrizione del movimento.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleziona qui la categoria del movimento.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleziona qui il tipo di movimento.
 
 Le opzioni disponibili variano a seconda se il movimento è un deposito o un prelievo.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Inserisci qui l&apos;importo del movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tassa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Inserisci ogni tassa associata a questo movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Inserisci qui ogni altra informazione per questo movimento.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Conti</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elettronica</translation>
+        <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Carburante</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Film</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaggio</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carta di Credito</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Parente</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Spese Varie</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contante</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Elettronica</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/citytime.ts b/i18n/it/citytime.ts
index f5558ba..b742f7e 100644
--- a/i18n/it/citytime.ts
+++ b/i18n/it/citytime.ts
@@ -1,67 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
         <translation>Cambio Fuso Orario</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
         <translation>C&apos;è stato un problema nell&apos;impostare il fuso orario %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
         <translation>Ripristinare Fuso Orario</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>C&apos;è stato un problema nell&apos;impostare il fuso orario. L&apos;orario può essere sbagliato...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Fuso Orario</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
-        <translation>Clicca su una delle città per rimpiazzarla</translation>
+        <translation>Premi su una delle città per rimpiazzarla</translation>
     </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Città</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
         <translation>Impossibile Trovare Info sul Fuso Orario</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
         <translation>&lt;p&gt;Impossibile trovare informazioni sul fuso orario in %1</translation>
     </message>
     <message>
         <source>Continent</source>
         <translation>Continente</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
         <translation>Selezionare qui un continente/paese, poi selezionare una città</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Città</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
         <translation>Impossibile Trovare Mappa</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
         <translation>&lt;p&gt;Impossibile caricare mappa: %1, esco</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/clock.ts b/i18n/it/clock.ts
index cea3a4d..7b47971 100644
--- a/i18n/it/clock.ts
+++ b/i18n/it/clock.ts
@@ -1,94 +1,100 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Snooze</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Orologio</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Cronografo</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Imposta Allarme</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Imposta data ed orario.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Allarme Inserito</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Allarme Disinserito</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Orologio: Allarme mancante.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Allarme impostato: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Imposta Allarme</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Ora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation>Minuto</translation>
+        <translation>Minuti</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>allarme mp3</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation>Ritardo Snooze
+        <translation>Ritardo
+Snooze
 (minuti)</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index 45d9098..f52786f 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -1,811 +1,838 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>La durata dell&apos;evento è probabilmente più
 lunga dell&apos;intervallo tra le ripetizioni.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Modifica Evento</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minuti)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare le
 modifiche.
 Liberare dello spazio e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Sconosciuto)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Errore!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Ripara</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continua</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Copia Evento</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Modifica...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>box di errore</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Trasmetti questa occorrenza</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Inizio visualizzazione eventi</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Ora inizio:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Impostazioni Allarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Regolazione Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stile riga:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Viste</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista predefinita:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Lista Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Vai all&apos;orario corrente</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostra orario</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Inizio-Fine</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>LMMGVSDL</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>L</translation>
+        <translation type="obsolete">Lun</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mar</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>M</translation>
+        <translation type="obsolete">Mer</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>G</translation>
+        <translation type="obsolete">Gio</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>V</translation>
+        <translation type="obsolete">Ven</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">Sab</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>D</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>p</translation>
+        <translation type="obsolete">Dom</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ripeti...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Giornalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Settimanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensilmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Annualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Mai...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nuovo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ubicazione</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Appuntamento</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pranzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaggio</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inizio - Fine </translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Gen 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Ora inizio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso orario</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ripetuto</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Non Ripetere...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Modifica Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pranzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>th</source>
         <translation>°</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Non Ripetere</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>giorno(i)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>anno(i)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>week</source>
         <translation>settimana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>su </translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fino Al:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ripeti Ogni</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>mesi</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anni</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/drawpad.ts b/i18n/it/drawpad.ts
index c8de8c2..75e167a 100644
--- a/i18n/it/drawpad.ts
+++ b/i18n/it/drawpad.ts
@@ -1,441 +1,449 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Cancella Tutto</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importa</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importa...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Esporta</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Esporta...</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Vista Miniature</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Vista Miniature...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informazioni Pagina</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informazioni Pagina...</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-Aliasing</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Opz.</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nuova Pagina</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Cancella Pagina</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Elimina Pagina</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Annulla</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Ripeti</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Prima Pagina</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Pagina Precedente</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Pagina Successiva</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Ultima Pagina</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Disegno Libero</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Disegna Linea</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Disegna Rettangolo</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Disegna Rettangolo Pieno</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Disegna Ellisse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Disegna Ellisse Piena</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Inserisci Testo</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Riempi Spazio</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Spessore Penna</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Colore Penna</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Colore Riempitura</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Vuoi cancellare
 la pagina corrente?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Vuoi eliminare
 la pagina corrente?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Vuoi eliminare tutte
 le pagine?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation>Clicca qui per aggiungere un nuovo foglio.</translation>
+        <translation>Premi qui per aggiungere un nuovo foglio.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation>Clicca qui per cancellare il foglio corrente.</translation>
+        <translation>Premi qui per cancellare il foglio corrente.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation>Clicca qui per eliminare il foglio corrente.</translation>
+        <translation>Premi qui per eliminare il foglio corrente.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
-        <translation>Clicca qui per annullare l&apos;ultima azione.</translation>
+        <translation>Premi qui per annullare l&apos;ultima azione.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
-        <translation>Clicca qui per ri-eseguire l&apos;ultima azione.</translation>
+        <translation>Premi qui per ri-eseguire l&apos;ultima azione.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
-        <translation>Clicca qui per visualizzare la prima pagina.</translation>
+        <translation>Premi qui per visualizzare la prima pagina.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
-        <translation>Clicca qui per visualizzare la pagina precedente.</translation>
+        <translation>Premi qui per visualizzare la pagina precedente.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
-        <translation>Clicca qui per visualizzare la pagina successiva.</translation>
+        <translation>Premi qui per visualizzare la pagina successiva.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
-        <translation>Clicca qui per visualizzare l&apos;ultima pagina.</translation>
+        <translation>Premi qui per visualizzare l&apos;ultima pagina.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
-        <translation>Clicca qui per selezionare uno degli strumenti disponibili per disegnare linee.</translation>
+        <translation>Premi qui per selezionare uno degli strumenti disponibili per disegnare linee.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation>Clicca qui per selezionare uno degli strumenti disponibili per disegnare rettangoli.</translation>
+        <translation>Premi qui per selezionare uno degli strumenti disponibili per disegnare rettangoli.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation>Clicca qui per selezionare uno degli strumenti disponibili per disegnare ellissi.</translation>
+        <translation>Premi qui per selezionare uno degli strumenti disponibili per disegnare ellissi.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
-        <translation>Clicca qui per selezionare lo strumento per il testo.</translation>
+        <translation>Premi qui per selezionare lo strumento per il testo.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
-        <translation>Clicca qui per selezionare lo strumento di riempimento.</translation>
+        <translation>Premi qui per selezionare lo strumento di riempimento.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
-        <translation>Clicca qui per selezionare lo strumento di cancellazione.</translation>
+        <translation>Premi qui per selezionare lo strumento di cancellazione.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
-        <translation>Clicca qui per selezionare la larghezza della penna per disegnare.</translation>
+        <translation>Premi qui per selezionare la larghezza della penna per disegnare.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
-        <translation>Clicca qui per selezionare il colore usato per disegnare.</translation>
+        <translation>Premi qui per selezionare il colore usato per disegnare.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
-        <translation>Clicca qui per selezionare il colore usato per riempire le aree.</translation>
+        <translation>Premi qui per selezionare il colore usato per riempire le aree.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>DrawPad - Pag. %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation>DrawPad - Esporta</translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation>Selezione Pagina</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Corrente</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Intervallo</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>A:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Esporta come</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Formato:</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Tutte le immagini</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
         <translation>DrawPad - Importa</translation>
     </message>
     <message>
         <source>Automatic preview</source>
         <translation>Anteprima
 automatica</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Anteprima</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Tutte le immagini</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nuova Pagina</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titolo:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Larghezza:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Altezza:</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Sfondo</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Bianco</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Colore Penna</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Colore Riempitura</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Informazioni Pagina</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titolo:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Larghezza:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Altezza:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Titolo: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Dimensioni: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Data: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Inserisci Testo</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>DrawPad - Vista Miniature</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Cancella Pagina</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Vuoi cancellare
 la pagina selezionata?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Elimina Pagina</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Vuoi eliminare
 la pagina selezionata?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation>Clicca qui per aggiungere un nuovo foglio.</translation>
+        <translation>Premi qui per aggiungere un nuovo foglio.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation>Clicca qui per cancellare il foglio corrente.</translation>
+        <translation>Premi qui per cancellare il foglio corrente.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation>Clicca qui per eliminare il foglio corrente.</translation>
+        <translation>Premi qui per eliminare il foglio corrente.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
-        <translation>Clicca qui per spostare il foglio corrente una posizione sù nella lista.</translation>
+        <translation>Premi qui per spostare il foglio corrente una posizione sù nella lista.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
-        <translation>Clicca qui per spostare il foglio corrente una posizione giù nella lista.</translation>
+        <translation>Premi qui per spostare il foglio corrente una posizione giù nella lista.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index 32d5c98..67e811d 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -1,218 +1,238 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sezione Comandi</translation>
     </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">nuovo</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="obsolete">modifica</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">elimina</translation>
+    </message>
+    <message>
+        <source>up</source>
+        <translation type="obsolete">sù</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation type="obsolete">giù</translation>
+    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi Suggeriti&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Medio</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista Comandi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Visualizza lista comandi</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Nascondi lista comandi</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Tab in Fondo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde su Nero</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Nero su Bianco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bianco su Nero</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Nero su Trasparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Nero su Rosso</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Rosso su Nero</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde su Giallo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blu su Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta su Blu</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Cyan su Bianco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Bianco su Cyan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Blu su Nero</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spazio</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Sù</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Disattiva</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra di Scorrimento</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Visualizza Lista Comandi</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>A Capo</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usa Beep</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation>Tabs Sopra</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selezione Comandi</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Inserisci comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Inserisci comando da aggiungere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/euroconv.ts b/i18n/it/euroconv.ts
index 4eb9e18..afd57d1 100644
--- a/i18n/it/euroconv.ts
+++ b/i18n/it/euroconv.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Euroconv</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/filebrowser.ts b/i18n/it/filebrowser.ts
deleted file mode 100644
index c6bde4c..0000000
--- a/i18n/it/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>File Manager</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Dir</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordina</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>per Nome</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>per Dimensione</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>per Data</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>per Tipo</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Ascendente</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>File Nascosti</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Link Simbolici</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Miniature</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Vista</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Directory precedente</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Directory superiore</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nuova cartella</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Taglia</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copia</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Incolla</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>File Manager</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>Impossibile visualizzare la directory /dev/.</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Rinomina file</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Rinominazione fallita!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Incolla  file</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Incollaggio fallito!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Taglia file</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Taglio fallito!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Sei sicuro?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Cancellazione fallita!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nuova cartella</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Creazione cartella fallita!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Lancio Applicazione</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Lancio fallito!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Aggiungi ai Documenti</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Esegui</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Visualizza come testo</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Rinomina</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Taglia</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copia</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Incolla</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Cambio Permessi</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Seleziona tutto</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Deseleziona tutto</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Cambio permessi</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Setta Permessi sui File</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Setta permessi sui file per:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>proprietario</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>gruppo</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>altri</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Proprietario</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Gruppo</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>lettura</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>scrittura</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>esegui</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/formatter.ts b/i18n/it/formatter.ts
index 46a05b3..89ddfbe 100644
--- a/i18n/it/formatter.ts
+++ b/i18n/it/formatter.ts
@@ -1,174 +1,222 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formatter</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tipo Storage</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>File System</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatta</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principale</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>ATTENZIONE:
+        <translation type="obsolete">ATTENZIONE:
 Cambiare i parametri su questa 
 pagina può causare il non corretto 
 funzionamento del tuo sistema!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>Modifica fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Controlla Disco</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Device</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mount Point</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzate</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Formatto?!?</translation>
+        <translation type="obsolete">Formatto?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Formatto veramente
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 con </translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation> filesystem?!?
+        <translation type="obsolete"> filesystem?!?
 Perderai tutti i dati!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Impossibile formattare.
 Tipo sconosciuto</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Ouput Formatter</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
-        <translation>Tento di smontate.</translation>
+        <translation>Tento di smontare.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>umont fallito!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Impossibile smontare.
 Device occupato!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Tento di formattare.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Nessun device!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 è stato formattato con successo.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Tento di montare.</translation>
+        <translation type="obsolete">Tento di montare.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Mount Card fallito!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 è stato montato con successo.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>Ora puoi chiudere la finestra di output.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interno</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Tipo Storage : </translation>
+        <translation type="obsolete">Tipo Storage : </translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Totali: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Usati: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Disponibili: %1 kB ( %d mB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>ATTENZIONE:
+Cambiare i parametri su questa 
+pagina può causare il non corretto 
+funzionamento del sistema!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>Formatto?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>
+con il filesystem %1?
+Perderai tutti i dati!!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>Tento di smontare %1.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>Tento di montare %1.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1
+è stato montato con successo.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Tipo Storage: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Tipo: %1
+Formattato con %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/helpbrowser.ts b/i18n/it/helpbrowser.ts
index 4a8f8b9..d2088e1 100644
--- a/i18n/it/helpbrowser.ts
+++ b/i18n/it/helpbrowser.ts
@@ -1,37 +1,38 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Indietro</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avanti</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Pagina Iniziale</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Aggiungi Bookmark</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Cancella dai Bookmark</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Aiuto</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>Aiuto</translation>
+        <source>Go</source>
+        <translation>Vai</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/kbill.ts b/i18n/it/kbill.ts
index e8f5e87..30e71a4 100644
--- a/i18n/it/kbill.ts
+++ b/i18n/it/kbill.ts
@@ -1,65 +1,65 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation></translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Nuova partita</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pausa</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>Storia di kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regole</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pausa</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation>&lt;b&gt;La Storia&lt;/b&gt;&lt;p&gt;Ancora una volta, il destino del mondo è nelle tue mani!  Un hacker malvagio, conosciuto solo con il nickname di &apos;Bill&apos;, ha creato il virus informatico definito.  Un virus così potente che può trasformare un normale computer in un tostapane.  (oooh!) &apos;Bill&apos; ha clonato se stesso in milioni/miliardi di micro-Bill.  Il loro unico scopo è quello di trasmettere il malvagio virus, che è stato astutamente camuffato come un famoso sistema operativo. Come Amministratore di Sistema e Sterminatore, il tuo compito è di fermare il malvagio piano di Bill .</translation>
+        <translation>&lt;b&gt;La Storia&lt;/b&gt;&lt;p&gt;Ancora una volta, il destino del mondo è nelle tue mani!  Un hacker malvagio, conosciuto solo con l&apos;alias di &apos;Bill&apos;, ha creato il virus informatico definito.  Un virus così potente che può trasformare un normale computer in un tostapane. Bill ha clonato se stesso in milioni/miliardi di micro-Bill. Il loro unico scopo è quello di trasmettere il malvagio virus, che è stato astutamente camuffato come un famoso sistema operativo. Come Amministratore di Sistema e Sterminatore, il tuo compito è di fermare il malvagio piano di Bill .</translation>
     </message>
     <message>
         <source>The story of KBill</source>
         <translation>La storia di KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Le regole di KBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation>&lt;b&gt;Le Regole&lt;/b&gt;&lt;p&gt;kBill è stato scrupolosamente disegnato in modo da essere facilemente utilizzato da tutta la famiglia. Anni - anzi - giorni di beta testing e di consultazioni con i più economici sviluppatori di interfacce grafiche hanno portato a sviluppare un gioco facile da usare, ma niente a che vedere con un Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schiaccia i Bill (click)&lt;/LI&gt;&lt;LI&gt;Riavvia il computer (click)&lt;/LI&gt;&lt;LI&gt;Riprendi i SO rubati &amp; riportali (trascinandoli) sui rispettivi computer&lt;/LI&gt;&lt;LI&gt;Trascina il secchi per spegnere le scintille&lt;/LI&gt;&lt;LI&gt;Il punteggio è basato sul tempo totale, con bonus per l&apos;uccisione dei Bill.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Per tutto il resto, riuscirai sicuramente a farlo funzionare da solo.  Noi lo abbiamo fatto, quindi non può essere troppo difficile</translation>
+        <translation>&lt;b&gt;Le Regole&lt;/b&gt;&lt;p&gt;kBill è stato scrupolosamente disegnato in modo da essere facilemente utilizzato da tutta la famiglia. Anni - anzi - giorni di beta testing e di consultazioni con i più economici sviluppatori di interfacce grafiche hanno portato a sviluppare un gioco facile da usare, ma niente a che vedere con un Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schiaccia i Bill (premi)&lt;/LI&gt;&lt;LI&gt;Riavvia il computer (premi)&lt;/LI&gt;&lt;LI&gt;Riprendi i SO rubati e riportali (trascinandoli) sui rispettivi computer&lt;/LI&gt;&lt;LI&gt;Trascina il secchio per spegnere le scintille&lt;/LI&gt;&lt;LI&gt;Il punteggio è basato sul tempo totale, con bonus per l&apos;uccisione dei Bill.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Per tutto il resto, riuscirai sicuramente a farlo funzionare da solo.  Noi lo abbiamo fatto, quindi non può essere troppo difficile</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Livello Successivo</translation>
     </message>
     <message>
         <source>Your score</source>
-        <translation>Punteggio</translation>
+        <translation>Punti</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/kpacman.ts b/i18n/it/kpacman.ts
index 5adda5f..4ddce63 100644
--- a/i18n/it/kpacman.ts
+++ b/i18n/it/kpacman.ts
@@ -1,249 +1,243 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Cambia Tasti Direzionali</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Tasto non associato</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nuovo</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pausa</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hall of fame</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Esci</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Nacondi Cursore Mouse</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Seleziona schema grafico</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pausa in Background</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Continua in Primo Piano</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Cambia &amp;tasti...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Un pacman per il Desktop KDE
 
 Il programa è basato sui sorgenti di ksnake
 di Michel Filippi (mfilippi@sade.rhein-main.de).
 Il design è stato influenzato fortemente dal pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Vorrei ringraziare la mia ragazza Elke Krueers per
 gli ultimi 10 anni della sua amicizia.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>Errore di Configurazioneù</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation>Non ci sono schemi definiti, o non è
-stato selezionato nessuno schema.</translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Il bitfont non può essere costruito.
 
 Il file &apos;@FONTNAME@&apos; non esiste,
 oppure è in un formato sconosciuto.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FINE  PARTITA</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>GIOCATORE 1</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRONTO!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>PERSONAGGIO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>NICKNAME</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PREMI CURSORE PER INIZIARE</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>PUTEGGIO</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     CONGRATULAZIONI      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    SEI ARRIVATO   </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  UN PUTEGGIO NEI PRIMI 10.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>LIV   PUNT.  NOME   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Il pixmap non può essere costruito.
 
 Il file &apos;@PIXMAPNAME@&apos; non esiste,
 oppure è in un formato sconosciuto.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Errore di Inizializzazione</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/language.ts b/i18n/it/language.ts
index ab8392a..257570c 100644
--- a/i18n/it/language.ts
+++ b/i18n/it/language.ts
@@ -1,29 +1,25 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>Inglese</translation>
     </message>
     <message>
         <source>default</source>
         <translation>predefinito</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation type="obsolete">Lingua</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>Seleziona lingua</translation>
     </message>
     <message>
         <source>Language Settings</source>
         <translation>Impostazioni Lingua</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/launchersettings.ts b/i18n/it/launchersettings.ts
index d99edc2..5d81890 100644
--- a/i18n/it/launchersettings.ts
+++ b/i18n/it/launchersettings.ts
@@ -1,209 +1,209 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Impostazioni Launcher</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tab</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Carica applet nel O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostra tab del Launcher nel O-Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Controlla le applet che vuoi inserite nel O-Menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Aggiungi i contenuti dei Tab del Launcher come menu nel O-Menu.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Esempio 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Esempio 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Esempio 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Modifica Tab</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Sfondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icone</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Anteprima %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Questa è un&apos;anteprima di come verrà visualizzato il Tab selezionato.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usa un font personalizzato</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Ruled</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Colore solido</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Seleziona...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Dimensione:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Colore:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher Tab:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Abilita indicatore occupato grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Abilita indicatore occupato lampeggiante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleziona il Launcher Tab che vuoi modificare o eliminare.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Aggiungi un nuovo Tab al Launcher.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Apri una nuova finestra per personalizzare il Tab selezionato.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Elimina un Tab dal Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Attiva questo, se vuoi un indicatore di occupato grande al centro dello schermo invece di quello nella taskbar.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Attiva questo, se vuoi un indicatore di occupato lampeggiante per far partire le applicazioni nel Launcher.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Tutti i Tab</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Ancora non implementato</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Carica applet nella Taskbar</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Controlla le applet che vuoi visualizzate nella Taskbar.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/librestartapplet.ts b/i18n/it/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/fr/librestartapplet.ts
+++ b/i18n/it/lib.ts
diff --git a/i18n/it/libbatteryapplet-ipaq.ts b/i18n/it/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 5c31212..0000000
--- a/i18n/it/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Stato Batteria per Ipaq</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Chiudi</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation>Insufficienza</translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation>impossibile aprire il file</translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation>In carica entrambi gli apparecchi</translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation>In carica</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>Percentuale batteria rimasta</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>Stato batteria:</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>Buono</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>Basso</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>Molto Basso</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>Critico</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>Sconosciuto</translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation>Carica di backup</translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation>Alimentazione esterna inserita</translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation>Alimentazione esterna disinserita</translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation>Tempo batteria rimasto</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>Percentuale batteria rimasta:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>Tempo batteria rimasto:</translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation>Jacket con batteria non inserito</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index a8f6833..e69a5a8 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -1,90 +1,86 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Stato Batteria</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>In carica</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Percentuale batteria rimasta</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Stato batteria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Buono</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Molto Basso</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>Critico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Carica di riserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentazione esterna inserita</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentazione esterna disinserita</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Tempo batteria rimasto</translation>
     </message>
     <message>
         <source>Battery status</source>
         <translation>Stato Batteria</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>impossibile aprire il file</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>In carica entrambi gli apparecchi</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
         <translation>Percentuale batteria rimasta:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
         <translation>Tempo batteria rimasto:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Jacket con batteria non inserito</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libclockapplet.ts b/i18n/it/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/it/libclockapplet.ts
+++ b/i18n/it/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/it/libdialup.ts b/i18n/it/libdialup.ts
deleted file mode 100644
index 02fd133..0000000
--- a/i18n/it/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation>Dial-up </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Username:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Password:</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Telefono:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nome:</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation>Modem</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation>Dispositivo:</translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation>IrDA</translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation>PCMCIA</translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation>Seriale</translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation>AT-dial:</translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation>ATDT</translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation>ATDP</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Velocità:</translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation>4800</translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation>9600</translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation>19200</translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation>38400</translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation>57600</translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation>115200</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Tempo di attesa:</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation>sec</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Controllo di Flusso:</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Controllo di flusso hardware</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Connessione Automatica</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Connessione e disconnessione manuale</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> secondi</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Timeout Idle:</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Connessione e disconnessione automatica</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Connessione manuale, disconnesione automatica</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Network</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Scopri automaticamente DNS</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Gateway</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Scopri automaticamente routing</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>DNS Principale</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>DNS Secondario</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxy</translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>In attesa</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Inizializzazione modem</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>In connessione</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Autenticazione</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Nessun tono</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Nessuna portante</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Il numero è occupato</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Tempo esaurito</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Connessione fallita</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Autenticazione fallita</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Connesso</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Settaggio Proxy</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Nessun Proxy</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Configurazione automatica proxy</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Imposta proxy</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Config:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Porta:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Host:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Nessun proxy per:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/libflatstyle.ts b/i18n/it/libflatstyle.ts
index 4eb9e18..6cdb545 100644
--- a/i18n/it/libflatstyle.ts
+++ b/i18n/it/libflatstyle.ts
@@ -1,2 +1,11 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Flat</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libhomeapplet.ts b/i18n/it/libhomeapplet.ts
index 59d9e3d..a2ca734 100644
--- a/i18n/it/libhomeapplet.ts
+++ b/i18n/it/libhomeapplet.ts
@@ -1,18 +1,14 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Shortcut Home</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation type="obsolete">Home</translation>
-    </message>
-    <message>
         <source>Desktop</source>
         <translation>Desktop</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libinterfaces.ts b/i18n/it/libinterfaces.ts
index 95adf04..892925a 100644
--- a/i18n/it/libinterfaces.ts
+++ b/i18n/it/libinterfaces.ts
@@ -1,155 +1,163 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Informazioni Avanzate Interfaccia</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Indirizzo IP</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Interfaccia</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnet Mask</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>Informazioni DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>Server DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Lease Scaduto</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Lease Ottenuto</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC Address</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Informazioni Interfaccia</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Aggiorna</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>R&amp;iavvia</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Indirizzo IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnet Mask</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC Address</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>&amp;Mostra Informazioni Avanzate</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation>&amp;silenzioso</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Configurazione Interfaccia</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Automaticamente attivata</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Configurazione Ip Statico</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Subnet Mask</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>DNS Principale</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>Indirizzo IP</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>DNS Secondario</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>Riavvia interfaccia</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libkeyview.ts b/i18n/it/libkeyview.ts
deleted file mode 100644
index d9e8a1c..0000000
--- a/i18n/it/libkeyview.ts
+++ b/dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation>Keyview</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/libkppp.ts b/i18n/it/libkppp.ts
new file mode 100644
index 0000000..94e02f0
--- a/dev/null
+++ b/i18n/it/libkppp.ts
@@ -0,0 +1,1515 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="obsolete">&amp;Modifica...</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation>Permette di modificare l&apos;account selezionato</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="obsolete">&amp;Nuovo...</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation>Crea una nuova connessione dialup
+verso Internet</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="obsolete">Co&amp;pia</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation>Crea una copia dell&apos;account selezionato. Tutte le
+impostazioni dell&apos;account selezionato saranno copiate
+nel nuovo account, che potrai modificare liberamente</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="obsolete">Cance&amp;lla</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Cancella l&apos;account selezionato
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usa con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>Maximum number of accounts reached.</source>
+        <translation type="obsolete">Raggiunto numero massimo di account.</translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation>Nessun account selezionato.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation>Sei sicuro di voler cancellare
+l&apos;account &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Conferma</translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation>Nuovo Account</translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation>Modifica Account: </translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation>Componi</translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation>Modifica Script Login</translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation>Autenticazione</translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation>Impostazioni IP</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation>Impostazioni Gateway</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Gateway</translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation>Server DNS</translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation>DNS</translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation>Esegui Programmi</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Esegui</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation>Devi inserire un nome account univoco</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="obsolete">Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="obsolete">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="obsolete">GB</translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation>Autenticazione: </translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation>Basato-su-script</translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation>PAP</translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation>Basato-sul-terminale</translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation>CHAP</translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation>PAP/CHAP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation>&lt;p&gt;Specifica il metodo utilizzato per identificarti sul server
+PPP. Molte università utilizzano ancora l&apos;autenticazione
+basata su &lt;b&gt;terminale&lt;/b&gt; o su &lt;b&gt;script&lt;/b&gt;,
+mentre molti ISP utilizzano &lt;b&gt;PAP&lt;/b&gt; e/o &lt;b&gt;CHAP&lt;/b&gt;.
+Se non sei sicuro, contatta il tuo ISP.
+
+Se puoi scegliere tra PAP e CHAP, scegli CHAP, poichè
+è molto più sicuro. Se non sai quale dei due è quello corretto,
+scegli PAP/CHAP.</translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation>Username: </translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation>Inserisci qui il tuo username...</translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation>Password: </translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation>Inserisci qui la tua password</translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation>Memorizza password</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation>&lt;p&gt;Se questa opzione è attivata, la password per il tuo ISP
+verrà salvata nel file di configurazione di &lt;i&gt;kppp&lt;/i&gt;, così
+non dovrai ridigitarla ogni volta.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Attenzione:&lt;/font&gt; la tua password sarà
+salvata nel file di configurazione in chiaro, che è leggibile
+solo da te. Controlla che nessun altro abbia accesso a questo file!</translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation>errore</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation>&lt;qt&gt;Lo script di login ha un ciclo di Inizio/Fine non bilanciato&lt;qt&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Modifica...</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation>&amp;Nuovo...</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation>Co&amp;pia</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation>Cance&amp;lla</translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation>Nome Dominio:</translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation>Se inserisci qui un nome di dominio, quest&apos;ultimo
+verrà utilizzato per la connessione.
+Quando la connessione verrà terminata, sarà ripristinato
+il nome originale del dominio del tuo computer.
+
+If you leave this field blank, no changes are
+made to the domain name.</translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation>Configurazione:</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatica</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Manuale</translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation>Indirizzo IP DNS:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Permette di specificare un nuovo server DNS per
+la connessione. Quando la connessione verrà terminata,
+questo indirizzo sarà tolto.
+
+Per inserire un server DNS, inserisci qui l&apos;indirizzo IP
+e premi su &lt;b&gt;Aggiungi&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation>Premi questo pulsante per aggiungere il server DNS
+specificato nel campo in alto. Il server sarà
+quindi aggiunto nella lista in basso</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation>Premi questo pulsante per rimuovere il server DNS
+selezionato dalla lista in basso</translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation>Lista indirizzi DNS:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation>&lt;p&gt;Qui vengono visualizzati tutti i server DNS da utilizzare
+durante la connessione. Utilizza i pulsanti &lt;b&gt;Aggiungi&lt;/b&gt; e
+&lt;b&gt;Rimuovi&lt;/b&gt; per modificare la lista</translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation>Disabilita server DNS durante la connessione</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation>&lt;p&gt;Quando questa opzione è selezionata, tutti i server
+DNS specificati in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; saranno
+temporaneamente disabilitati durante la connessione
+dialup. Dopo che la connessione sarà terminata, i server
+saranno riabilitati.
+
+Normalmente, non c&apos;è alcuna ragione per utilizzare
+questa opzione, ma può tornare utile in certe circostanze.</translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="obsolete">Permette di modificare l&apos;account selezionato</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="obsolete">Crea una nuova connessione dialup
+verso Internet</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="obsolete">Crea una copia dell&apos;account selezionato. Tutte le
+impostazioni dell&apos;account selezionato saranno copiate
+nel nuovo account, che potrai modificare liberamente</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Cancella l&apos;account selezionato
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usa con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>No devices selected.</source>
+        <translation>Nessun dispositivo selezionato.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation>Sei sicuro di voler cancellare il
+dispositivo &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Conferma</translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation>Nuovo Dispositivo</translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation>Modifica Dispositivo: </translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation>&amp;Dispositivo</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation>&amp;Modem</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="obsolete">Devi inserire un nome account univoco</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation>Permette di modificare il dispositivo selezionato</translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation>Crea un nuovo dispositivo</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation>Crea una copia del dispositivo selezionato.
+Tutte le impostazioni del dispositivo selezionato
+saranno copiate su un nuovo dispositivo, che
+potrai modificare a piacimento</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Cancella il dispositivo selezionato
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usare con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation>Devi inserire un nome univoco per il dispositivo</translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation>Nome Connessione:</translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation>Digita un nome univoco per questa connessione</translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation>Numero telefonico:</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation>&amp;Aggiungi...</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Rimuovi</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation>&lt;p&gt;Specifica i numeri telefonici da utilizzare. Puoi
+impostare più numeri, premi semplicemente su
+&quot;Aggiungi&quot;. Puoi modificarel&apos;ordine di composizione
+dei numeri utilizzando le frecce.
+
+Quando un numero è occupato o fallisce, &lt;i&gt;kppp&lt;/i&gt;
+chiamerà il numero successivo e così via</translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation>Modifica Opzioni pppd...</translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation>Qui puoi selezionare i comandi da eseguire durante certe fasi della connessione. I comandi verranno eseguiti con la tua user id, quindi non puoi eseguire comandi che richiedono privilegi di root (a meno che, naturalmente, tu non sia già root).&lt;br&gt;&lt;br&gt;Digita per i programmi tutto il path completo altrimenti potrebbero non essere trovati.</translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation>Prima della connessione:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation>Permette di eseguire un programma &lt;b&gt;prima&lt;/b&gt; che una connessione
+sia stabilita. Viene eseguito immediatamente prima della composizione.
+
+Può essere utile, ad esempio per bloccare HylaFAX dall&apos;occupare
+il modem.</translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation>Dopo la connessione:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation>Permette di eseguire un programma &lt;b&gt;dopo&lt;/b&gt; che una
+connessione sia stabilita. Quando viene eseguito, tutti i
+preparativi per la connessione Internet sono terminati.
+
+Molto utile per scaricare la posta e le news</translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation>Prima della disconnessione:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation>Permette di eseguire un programma &lt;b&gt;prima&lt;/b&gt; che una
+connessione sia terminata. La connessione rimarrà aperta finchè
+il programma non terminerà.</translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation>Dopo la disconnessione:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation>Permette di eseguire un programma &lt;b&gt;dopo&lt;/b&gt; che una
+connessione sia terminata.</translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configurazione</translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation>Gateway predefinito</translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation>Questa opzione utilizza il computer a cui sei connesso
+(tramite il modem) come un gateway.
+Il tuo computer invierà a questo computer tutti i pacchetti
+non destinati a nessun altro computer nella tua rete locale,
+che li instraderà.
+
+Questa è l&apos;opzione predefinita per molti ISP, quindi
+probabilmente dovrai lasciarla attiva.</translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation>Gateway statico</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation>&lt;p&gt;Permette di specificare quale computer vuoi utilizzare
+come gateway (vedi &lt;i&gt;Gateway Predefinito&lt;/i&gt; qui sopra)</translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation>Indirizzo IP Gateway:</translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation>Assegna la rotta predefinita a questo gateway</translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation>Se questa opzione è abilitata, tutti i pacchetti
+per la rete locale saranno instradati attraverso
+la connessione PPP.
+
+Normalmente questa opzione è abilitata</translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configurazione</translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation>Indirizzo IP Dinamico</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation>Seleziona questa opzione se il computer ottiene
+un indirizzo internet (IP) ogni volta che viene
+effettuata una connessione.
+
+Questo metodo viene utilizzato da quasi tutti i
+Service Provider Internet, quindi può essere
+attivato.</translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation>Indirizzo IP Statico</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation>Seleziona questa opzione se il computer utilizza un
+indirizzo internet (IP) fisso. Normalmente non viene
+utilizzato, quindi a meno che tu non sappia bene
+cosa stai facendo, seleziona l&apos;indirizzo IP dinamico.
+</translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation>Indirizzo IP:</translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation>Se il computer ha un indirizzo internet permanente,
+devi inserire qui l&apos;indirizzo IP.</translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation>Machera Subnet:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation>&lt;p&gt;Se il computer ha un indirizzo internet statico,
+devi inserire qui una maschera di rete. In quasi tutti i
+casi la netmask sarà &lt;b&gt;255.255.255.0&lt;/b&gt;,
+ma potrebbe anche essere diversa.
+
+Se non sei sicuro, contatta il tuo Internet Service Provider</translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation>Configura automaticamente hostname da questo IP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation>&lt;p&gt;Ogni volta che ti connetti, il tuo hostname viene
+modificato per essere compatibile con l&apos;indirizzo IP
+che ti viene assegnato dal server PPP. Questo può
+essere utile se utilizzi un protocollo che dipende da
+questa informazione, ma può anche causare qualche
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problema&lt;/a&gt;.
+
+Non abilitare quest&apos;opzione se non sai cosa stai facendo.</translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation>Selezionando quest&apos;opzione si potrebbero avere degli strani problemi con il server X e le applicazioni quando kppp è connesso Non usarla se non sai bene cosa stai facendo!
+Per informazioni più dettagliate guarda nella documentazione nella sezione &quot;Domande più frequenti&quot; (FAQ).</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Attenzione</translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation>Nessuna password</translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation>Username definito ma nessuna password
+ Inserire una password</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation>&amp;Nome Modem:</translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation>Dispositi&amp;vo Modem:</translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation>Questo specifica la porta seriale dove è attaccato il modem.
+Su Linux/x86, normalmente può essere /dev/ttyS0 
+(COM1 sotto DOS) o /dev/ttyS1 (COM2 sotto DOS).
+
+Se utilizzi una scheda interna ISDN con emulazione dei
+comandi AT (molte schede sotto Linux lo supportano),
+devi selezione una delle /dev/ttyIx.</translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation>Controllo di &amp;Flusso:</translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation>Hardware [CRTSCTS]</translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation>Software [XON/XOFF]</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nessuno</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation>&lt;p&gt;Specifica come la porta seriale ed il modem
+comunicano. Non modificare questa impostazione
+se non sai veramente cosa stai facendo.
+
+&lt;b&gt;Predefinito&lt;/b&gt;: CRTSCTS</translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation>Terminazione &amp;Linea:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation>&lt;p&gt;Specifica come i comandi AT sono inviati al
+modem. Molti modem lavorano correttamente con
+l&apos;impostazione predefinita &lt;i&gt;CR/LF&lt;/i&gt;. Se il
+modem non reagisce alla stringa di inizializzazione,
+prova con diverse impostazioni di questo parametro.
+
+&lt;b&gt;Predefinito&lt;/b&gt;: CR/LF</translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation>Velocità di Co&amp;nnessione:</translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation>Specifica la velocità con cui la porta seriale ed il
+modem comunicano. Puoi iniziare con la velocità
+predefinita di 38400 bits/sec. Se è tutto ok puoi
+in seguito aumentarla, ma non più di 115200 bits/sec
+(a meno che la tua porta seriale non supporti velocità
+più elevate).</translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation>&amp;Usa file di lock</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Per prevenire che altri programmi accedano
+al modem mentre è stabilita la connessione, un file
+può essere creato per indicare che il modem
+è in uso. Un esempio di questo file su Linux è
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Qui puoi selezionare se effettuare o no questa
+operazione.
+
+&lt;b&gt;Predefinito&lt;/b&gt;: Attivo</translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation>Timeout Modem:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation>Questo specifica quanto a lungo &lt;i&gt;kppp&lt;/i&gt; deve attendere
+per la stringa di risposta &lt;i&gt;CONNECT&lt;/i&gt; dal modem. Il valore
+raccomandato è di 30 secondi.</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation>Attesa occupato:</translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation>&amp;Attesa del tono di libero prima di comporre</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Normalmente il modem attende un tono di libero
+dalla linea telefonica, che indica che può
+iniziare a comporre il numero. Se il tuo modem non
+riconosce il suono, o il tuo sistema telefonico non
+lo prevede, togli il check da questa opzione
+
+&lt;b&gt;Predefinito:&lt;/b&gt;: Attivo</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation>Specifica il numero di secondi da attendere prima di
+ricomporre se tutti i numeri chiamati sono occupati.
+Ciò è necessario poichè alcuni modem si bloccano
+se lo stesso numero è occupato troppe volte.
+
+Normalmente è 0 secondi, non cambiarlo
+se non ne hai realmente bisogno.</translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation>&amp;Volume modem:</translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation>Molti modem hanno un altoparlante che crea
+molto rumore durante la composizione. Qui
+puoi spegnerlo completamente o impostare
+un volume più basso.
+
+Se non funziona con il tuo modem, devi
+modificare direttamente il comando.</translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation>Modem esige linea CD</translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation>Questo controlla come &lt;i&gt;kppp&lt;/i&gt; rileva che il modem
+inon sta rispondendo. Se non hai avuto problemi
+con questa opzione, non modificarla.
+
+&lt;b&gt;Predefinito&lt;/b&gt;: Non attivo</translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation>Comandi Mod&amp;em...</translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation>Permette di cambiare i comandi AT per
+il tuo modem.</translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation>&amp;Interroga Modem...</translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation>Molti modem supportano il comando ATI per
+trovare la marca e la versione del modem.
+
+Premi questo pulsante per interrogare il tuo
+modem per quest&apos;informazione. Può infatti
+essere utile per configurare il modem</translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation>Configura Modem</translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation>Errore Modem</translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation>Testando il modem si è verificato un errore</translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation>&amp;Account</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="obsolete">&amp;Dispositivo</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="obsolete">&amp;Modem</translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation>&amp;Dispositivi</translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation>Modifica opzioni pppd</translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation>Opzione:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Predefiniti</translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation>Aggiungi Numero Telefonico</translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation>Inserisci un numero telefonico:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation>PPP</translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation>generico dispositivo ppp</translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation>Impossibile interfacciarsi con il modem.</translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation>Impossibile identificare stato della linea CD.</translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation>Il modem non risponde.</translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation>Il modem è occupato.</translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation>Modem Pronto.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation>Impossibile ripristinare le impostazioni della tty: tcsetattr()
+</translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation>Il modem non risponde.</translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation>Velocità sconosciuta</translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation>Richiesta ATI</translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation>Impossibile creare file di lock per il modem.</translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation>Ricerca modem...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation>Richiesta Modem scaduta.</translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation>Device Modem bloccato.</translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation>Modem Pronto</translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation>Attendere un attimo...</translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation>Risultati Richiesta Modem</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation>Non ti è permesso di chiamare con kppp.
+Contatta l&apos;amministratore di sistema.</translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation>Impossibile trovare il demone PPP!
+Assicurati che pppd sia installato.</translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation>Non hai i permessi per avviare pppd!
+Contatta l&apos;amministratore di sistema e chiedi l&apos;accesso a pppd.</translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation>Non hai permessi sufficienti per eseguire
+%1
+Assicurati che kppp sia di proprietà di root e che abbia il bit SUID impostato.</translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation>Impossibile trovare o leggere %1!
+Chiedi all&apos;amministratore di sistema di creare il file (può essere vuoto) con i corretti permessi di lettura e scrittura.</translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation>Modifica Comandi Modem</translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation>Ritardo Pre-inizializzazione (sec/100):</translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation>Stringa di inizializzazione %1:</translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation>Ritardo Post-inizializzazione (sec/100):</translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation>Velocità composizione (sec/100):</translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation>Risposta inizializzazione:</translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation>Ricerca tono di libero:</translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation>Stringa di composizione:</translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation>Risposta connessione:</translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation>Risposta occupato:</translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation>Risposta nessun segnale:</translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation>Risposta nessun segnale di libero:</translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation>Stringa hangup:</translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation>Risposta hangup:</translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation>Stringa risposta:</translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation>Risposta squillo:</translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation>Risposta Ricezione:</translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation>Stringa escape:</translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation>Risposta escape:</translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation>Tempo di sicurezza (sec/50):</translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation>Volume spento/basso/alto:</translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation>Connesso a:</translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation>Tempo connesso:</translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation>Volume:</translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation>Conto Sessione:</translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation>Conto Totale:</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation>Disconnetti</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation>Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation>KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation>GB</translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation>In connessione con: </translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation>Online</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Offline</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation>Connessione a: %1</translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation>Esecuzione comando pre-avvio...</translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation>Inizializzazione modem...</translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation>Impostazioni </translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation>Impostazione volume speaker...</translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation>Attesa disabilitazione tono di libero...</translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation>In composizione %1</translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation>Linea occupata. Disconnessione...</translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation>Linea occupata. Attesa: %1 secondi</translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation>Nessun Tono di Libero</translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation>Nessuna Portante</translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation>In scansione %1</translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation>In salvataggio %1</translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation>In invio %1</translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation>In attesa %1</translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation>Pausa %1 secondi</translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation>Tempo massimo %1 secondi</translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation>Hangup</translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation>Risposta</translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation>ID %1</translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation>Password %1</translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation>Richiesta %1</translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation>Richiesta PW %1</translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation>Inizio Ciclo %1</translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation>ERRORE: ciclo troppo annidato, ignorato.</translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation>Ciclo troppo anidato!</translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation>Fine Ciclo %1</translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation>Ciclo terminato senza trovare lo Start!: %1</translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation>Pppd in esecuzione...</translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation>Var Scan: %1</translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation>Trovato: %1</translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation>in ciclo: %1</translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation>Tempo scaduto per lo script!</translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation>In ricerca: %1</translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation>Atteso: %1</translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation>Registrazione sul network...</translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation>In esecuzione comando di avvio...</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Fatto</translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation>il comando pppd + le opzioni sulla riga di comando hanno superato i 2024 caratteri di lunghezza.</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossibile trovare il demone PPP!&lt;br&gt;Assicurati che pppd sia installato e che hai inserito il path corretto.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation>&lt;qt&gt;Impossibile eseguire:&lt;br&gt; %1&lt;br&gt;Controlla che siano stati assegnati i permessi suid e che pppd sia eseguibile.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossibile trovare:&lt;br&gt; %1&lt;br&gt;Controlla di aver impostato il modem correttamente e/o modifica l&apos;impostazione del modem nel tab modem della finestra di impostazioni.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Hai selezionato l&apos;autenticazione di tipo PAP o CHAP. Questa richiede di inserire una username ed una password!&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossibile creare file &quot;%1&quot;&lt;br&gt;per autenticazione PAP/CHAP&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation>Devi inserire un numero telefonico!</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::ModemWidget</name>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="obsolete">Timeout Modem:</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Inserisci</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/liblan.ts b/i18n/it/liblan.ts
deleted file mode 100644
index 1640181..0000000
--- a/i18n/it/liblan.ts
+++ b/dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation>Impostazione LAN</translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation>Questo nome già
-esiste. Inserire
-un nuovo nome.</translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation>LAN </translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Account</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nome:</translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation>Specifica Informazioni TCP/IP</translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation>Ottieni Informazioni TCP/IP Automaticamente</translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation>TCP/IP</translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation>Indirizzo IP</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Gateway</translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation>Subnet Mask</translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation>Broadcast</translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation>DNS</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>DNS Principale</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>DNS Secondario</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxy</translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation>Form2</translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation>Servizio:</translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation>Indirizzo IP:</translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Impostazioni Proxy</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Nessun proxy</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Configurazione automatica proxy</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Imposta proxy</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Config:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Porta:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Host:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Nessun proxy per:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/libliquid.ts b/i18n/it/libliquid.ts
index c46b27c..071946e 100644
--- a/i18n/it/libliquid.ts
+++ b/i18n/it/libliquid.ts
@@ -1,79 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation>Stile Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation>No trasparenza</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Colore sfondo
-</translation>
+        <translation>Colore sfondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Colore bottone
-</translation>
+        <translation>Colore pulsante</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
         <translation>Colore sfondo trasparente</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Colore bottone trasparente
-</translation>
+        <translation>Colore pulsante trasparente</translation>
     </message>
     <message>
         <source>Custom translucency</source>
         <translation>Trasparenza personalizzata</translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation>Colore menu</translation>
     </message>
     <message>
         <source>Text color</source>
         <translation>Colore testo</translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation>Opacità</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
         <translation>Usa testo menu ombreggiato</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Bottoni barra applicazioni senza rilievo</translation>
+        <translation>Pulsanti barra applicazioni senza rilievo</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
         <translation>Contrasto</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation>Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Stile Liquid ad alte prestazione by Mosfet</translation>
+        <translation>Stile Liquid ad alte performance di Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libmadplugin.ts b/i18n/it/libmadplugin.ts
new file mode 100644
index 0000000..18a1be5
--- a/dev/null
+++ b/i18n/it/libmadplugin.ts
@@ -0,0 +1,54 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>LibMadPlugin</name>
+    <message>
+        <source>No Song Open</source>
+        <translation>Nessuna Canzone Aperta</translation>
+    </message>
+    <message>
+        <source>Info: </source>
+        <translation>Info: </translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation>Nome: </translation>
+    </message>
+    <message>
+        <source>Genre: </source>
+        <translation>Genere: </translation>
+    </message>
+    <message>
+        <source>Bitrate: </source>
+        <translation>Bitrate: </translation>
+    </message>
+    <message>
+        <source>URL: </source>
+        <translation>URL: </translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titolo</translation>
+    </message>
+    <message>
+        <source>Artist</source>
+        <translation>Artista</translation>
+    </message>
+    <message>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation>Anno</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commento</translation>
+    </message>
+    <message>
+        <source>, Track: </source>
+        <translation>, Traccia: </translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/sfcave-sdl.ts b/i18n/it/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/fr/sfcave-sdl.ts
+++ b/i18n/it/libmodplugin.ts
diff --git a/i18n/it/libnetmonapplet.ts b/i18n/it/libnetmonapplet.ts
deleted file mode 100644
index cdb841a..0000000
--- a/i18n/it/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation>Rete Scollegata</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation>Disconnetti</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation>Password Rete</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Connetti</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation>Inserisci password per %1:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/libopie.ts b/i18n/it/libopie.ts
index c4d3f32..e920867 100644
--- a/i18n/it/libopie.ts
+++ b/i18n/it/libopie.ts
@@ -1,563 +1,676 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>ColorPopupMenu</name>
+    <name>Button</name>
     <message>
-        <source>More</source>
-        <translation type="obsolete">Ancora</translation>
+        <source>Calendar Button</source>
+        <translation>Pulsante Agenda</translation>
     </message>
     <message>
-        <source>More...</source>
-        <translation type="obsolete">Ancora...</translation>
+        <source>Contacts Button</source>
+        <translation>Pulsante ontatti</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Pulsante Menu</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Pulsante Posta</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Pulsante Home</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Pulsante Registrazione</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Rotazione Display</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Basso+Sù</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Basso+Giù</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Basso+Destra</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Basso+Sinistra</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Alto+Sù</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Alto+Giù</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Alto+Destra</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Alto+Sinistra</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation type="obsolete">Tinta:</translation>
+        <translation>Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
+        <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
+        <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation type="obsolete">Rosso:</translation>
+        <translation>Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
+        <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation type="obsolete">Blu:</translation>
+        <translation>Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation type="obsolete">Alpha channel:</translation>
+        <translation>Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation type="obsolete">Seleziona colore</translation>
+        <translation>Seleziona colore</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Ancora</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Ancora...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
+        <translation>FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="obsolete">Apri</translation>
+        <translation>Apri</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="obsolete">Salva</translation>
+        <translation>Salva</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documenti</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">File</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">Tutti i File</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tutti</translation>
-    </message>
-    <message>
         <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Salva</translation>
-    </message>
-    <message>
-        <source>C&amp;ancel</source>
-        <translation type="obsolete">C&amp;ancella</translation>
+        <translation>Nome:</translation>
     </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
-        <translation type="obsolete">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
+        <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="obsolete">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation type="obsolete">Mime Type</translation>
-    </message>
-    <message>
-        <source>Ser Permission</source>
-        <translation type="obsolete">Imposta Permessi</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Cancella</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="obsolete">Vuoi veramente cancellare</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">No</translation>
+        <translation>Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation type="obsolete">Grande</translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="obsolete">Medio</translation>
+        <translation>Medio</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="obsolete">Piccolo</translation>
+        <translation>Piccolo</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="obsolete">Stile</translation>
+        <translation>Stile</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
+        <translation>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>
+        <translation>Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Settimana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mese</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Anno</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Ogni:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequenza</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fine Il:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Indefinitivamente</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ripeti Su</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Indefinitivamente</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>giorni</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>giorno</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>settimane</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>settimana</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>mesi</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>mese</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>anni</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>anno</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>e</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+e </translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, e </translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>giorno(i)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Ripeti Il</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Lun</translation>
+    </message>
     <message>
-        <source>TimePicker</source>
-        <translation type="obsolete">TimePicker</translation>
+        <source>Tue</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Mer</translation>
     </message>
     <message>
+        <source>Thu</source>
+        <translation>Gio</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Ven</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Sab</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Dom</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>settimana(e)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Ripeti Per</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Giorno</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>mese(i)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>anno(i)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Ogni</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>su</translation>
+    </message>
+</context>
+<context>
+    <name>OTimePickerDialogBase</name>
+    <message>
         <source>Time:</source>
         <translation>Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Scegli l&apos;Orario:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Summary:</source>
-        <translation type="obsolete">Summario:</translation>
-    </message>
-    <message>
         <source>Description:</source>
         <translation type="obsolete">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type="obsolete">Priorità:</translation>
+        <translation>Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="obsolete">Avanzamento:</translation>
+        <translation>Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation type="obsolete">Scadenza:</translation>
+        <translation>Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="obsolete">Categoria:</translation>
-    </message>
-    <message>
-        <source>Alarmed Notification:</source>
-        <translation type="obsolete">Avviso Sonoro:</translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>Email Addresses: </source>
-        <translation type="obsolete">Indirizzi Email: </translation>
-    </message>
-    <message>
         <source>Home Phone: </source>
-        <translation type="obsolete">Telefono Casa: </translation>
+        <translation>Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation type="obsolete">Fax Casa: </translation>
+        <translation>Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation type="obsolete">Cellulare Casa: </translation>
+        <translation>Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation type="obsolete">Pagina Web Casa: </translation>
+        <translation>Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation type="obsolete">Pagina Web Ufficio: </translation>
+        <translation>Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation type="obsolete">Ufficio: </translation>
+        <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation type="obsolete">Telefono Ufficio: </translation>
+        <translation>Telefono Ufficio: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation type="obsolete">Fax Ufficio: </translation>
+        <translation>Fax Ufficio: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation type="obsolete">Cellulare Ufficio: </translation>
+        <translation>Cellulare Ufficio: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation type="obsolete">Cercapersone Ufficio: </translation>
+        <translation>Cercapersone Ufficio: </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation type="obsolete">Professione: </translation>
+        <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation type="obsolete">Assistente: </translation>
+        <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation type="obsolete">Direttore: </translation>
+        <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
-        <translation type="obsolete">Maschile</translation>
+        <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation type="obsolete">Femminile</translation>
+        <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation type="obsolete">Sesso: </translation>
+        <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation type="obsolete">Coniuge: </translation>
+        <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation type="obsolete">Compleanno: </translation>
+        <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation type="obsolete">Anniversario: </translation>
+        <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation type="obsolete">Alias: </translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titolo</translation>
+        <translation>Alias: </translation>
     </message>
     <message>
-        <source>First Name</source>
-        <translation type="obsolete">Nome</translation>
+        <source>Default Email: </source>
+        <translation>Email Principale: </translation>
     </message>
     <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Secondo Nome</translation>
+        <source>All Emails: </source>
+        <translation>Tutte le Email: </translation>
     </message>
     <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Cognome</translation>
+        <source>Children: </source>
+        <translation>Figli: </translation>
     </message>
     <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffisso</translation>
+        <source>Notes:</source>
+        <translation>Note:</translation>
     </message>
     <message>
-        <source>File As</source>
-        <translation type="obsolete">Visualizza Come</translation>
+        <source>Start:</source>
+        <translation>Inizio:</translation>
     </message>
     <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Titolo</translation>
+        <source>End:</source>
+        <translation>Fine:</translation>
     </message>
     <message>
-        <source>Department</source>
-        <translation type="obsolete">Dipartimento</translation>
+        <source>Note:</source>
+        <translation>Nota:</translation>
     </message>
     <message>
-        <source>Company</source>
-        <translation type="obsolete">Società</translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Telefono Ufficio</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax Ufficio</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Cellulare Ufficio</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Email Principale</translation>
+        <source>Every</source>
+        <translation>Ogni</translation>
     </message>
     <message>
-        <source>Emails</source>
-        <translation type="obsolete">Altre Email</translation>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 ogni </translation>
     </message>
     <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Telefono Casa</translation>
+        <source>The %1 every </source>
+        <translation>Il %1 ogni </translation>
     </message>
     <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax Casa</translation>
+        <source>The %1 %1 of every</source>
+        <translation type="obsolete">Il %1 %1 di ogni</translation>
     </message>
     <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Cellulare Casa</translation>
+        <source>Every </source>
+        <translation>Ogni </translation>
     </message>
     <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Indirizzo Ufficio</translation>
+        <source>Monday</source>
+        <translation>Lunedì</translation>
     </message>
     <message>
-        <source>Business City</source>
-        <translation type="obsolete">Città Ufficio</translation>
+        <source>Tuesday</source>
+        <translation>Martedì</translation>
     </message>
     <message>
-        <source>Business State</source>
-        <translation type="obsolete">Provincia Ufficio</translation>
+        <source>Wednesday</source>
+        <translation>Mercoledì</translation>
     </message>
     <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">CAP Ufficio</translation>
+        <source>Thursday</source>
+        <translation>Giovedì</translation>
     </message>
     <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Paese Ufficio</translation>
+        <source>Friday</source>
+        <translation>Venerdì</translation>
     </message>
     <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Cercapersone Ufficio</translation>
+        <source>Saturday</source>
+        <translation>Sabato</translation>
     </message>
     <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Pagina Web Ufficio</translation>
+        <source>Sunday</source>
+        <translation>Domenica</translation>
     </message>
     <message>
-        <source>Office</source>
-        <translation type="obsolete">Ufficio</translation>
+        <source>Documents</source>
+        <translation>Documenti</translation>
     </message>
     <message>
-        <source>Profession</source>
-        <translation type="obsolete">Professione</translation>
+        <source>Files</source>
+        <translation>File</translation>
     </message>
     <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistente</translation>
+        <source>All Files</source>
+        <translation>Tutti i File</translation>
     </message>
     <message>
-        <source>Manager</source>
-        <translation type="obsolete">Direttore</translation>
+        <source>Very high</source>
+        <translation>Molto alta</translation>
     </message>
     <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Indirizzo Casa</translation>
+        <source>High</source>
+        <translation>Alta</translation>
     </message>
     <message>
-        <source>Home City</source>
-        <translation type="obsolete">Città Casa</translation>
+        <source>Normal</source>
+        <translation>Normale</translation>
     </message>
     <message>
-        <source>Home State</source>
-        <translation type="obsolete">Provincia Casa</translation>
+        <source>Low</source>
+        <translation>Bassa</translation>
     </message>
     <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">CAP Casa</translation>
+        <source>Very low</source>
+        <translation>Molto bassa</translation>
     </message>
     <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Paese Casa</translation>
+        <source>Location:</source>
+        <translation>Ubicazione:</translation>
     </message>
     <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Pagina Web Casa</translation>
+        <source>This is an all day event</source>
+        <translation>Evento per tutto il giorno</translation>
     </message>
     <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Coniuge</translation>
+        <source>This is a multiple day event</source>
+        <translation>Evento per molti giorni</translation>
     </message>
     <message>
-        <source>Gender</source>
-        <translation type="obsolete">Sesso</translation>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Compleanno</translation>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Anniversario</translation>
+        <source>The %1 %2 of every</source>
+        <translation>Il %1 %2 di ogni</translation>
     </message>
+</context>
+<context>
+    <name>QWidget</name>
     <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Alias</translation>
+        <source>st</source>
+        <translation>°</translation>
     </message>
     <message>
-        <source>Children</source>
-        <translation type="obsolete">Figli</translation>
+        <source>nd</source>
+        <translation>°</translation>
     </message>
     <message>
-        <source>Notes</source>
-        <translation type="obsolete">Note</translation>
+        <source>rd</source>
+        <translation>°</translation>
     </message>
     <message>
-        <source>Groups</source>
-        <translation type="obsolete">Gruppi</translation>
+        <source>th</source>
+        <translation>°</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopieobex.ts b/i18n/it/libopieobex.ts
index b8e192a..5c031ca 100644
--- a/i18n/it/libopieobex.ts
+++ b/i18n/it/libopieobex.ts
@@ -1,125 +1,77 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">Trasmissione OBEX</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Trasmissione:</translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">nome file</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancella</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">Ricezione OBEX</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">TextLabel1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Nome File</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Un file ti è stato 
-trasmesso.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Inserisci</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Rifiuta</translation>
-    </message>
-</context>
-<context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Ricevuto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accetta</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;Hai ricevuto un file del tipo %1 (&lt;img src=&quot;%2&quot;&gt; )Cosa vuoi fare?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Invio:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Fatto</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa non abilitato!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Ricerca dispositivi IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth non disponibile</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Ricerca dispositivi bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Pianificazione per invii.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Clicca per inviare</translation>
+        <translation>Premi per inviare</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Inviato</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallito</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Tentativo %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Ricerca ancora per IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Inizia invio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqhandwriting.ts b/i18n/it/libqhandwriting.ts
index de10070..6c45b55 100644
--- a/i18n/it/libqhandwriting.ts
+++ b/i18n/it/libqhandwriting.ts
@@ -1,171 +1,163 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>Aiuto Calligrafia</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;Quando usi il riconoscimento automatico della calligrafia scrivi lentamente, accuratamente e con fermezza.&lt;li&gt;Quando disegni i tuoi caratteri utilizza le linee guida.&lt;li&gt;Quando disegni un carattere con più segni, ognuno di questi deve essere disegnato prima che scompaiano i segni grigi.&lt;li&gt;Fai pratica utilizzando il Trainer.&lt;li&gt;Quando inserisci un tuo nuovo carattere assicurati che sia sufficentemente diverso dai caratteri già presenti.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Suggerimenti</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Trainer</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
-        <source>Select a character from the list.  The writing area on the left shows the reference character.  Practice writing in the area on the right.</source>
-        <translation type="obsolete">Seleziona un carattere dall&apos;elenco.  L&apos;area per scrivere sulla sinistra mostra un carattere di riferimento.  Fai pratica scrivendo nell&apos;area sulla destra.</translation>
-    </message>
-    <message>
         <source>Matched: </source>
         <translation>Trovati: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Simili a: </translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
         <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
         <translation>Seleziona dalla lista un carattere di riferimento. Fai pratica scrivendo nell&apos;area sulla destra.</translation>
     </message>
     <message>
         <source>No match</source>
         <translation>Nessuna corrispondenza</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Handwriting</source>
         <translation>Handwriting</translation>
     </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Nuovo...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInput</name>
     <message>
         <source>Shortcut</source>
         <translation>Scorciatoia</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>Inserisci un nuovo carattere</translation>
     </message>
     <message>
         <source>Character:</source>
         <translation>Carattere:</translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
-    </message>
-    <message>
         <source>Multi-stroke character timeout:</source>
         <translation>Timeout carattere con più segni:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>Aree di inserimento visualizzate</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>Aree caratteri maiuscoli e minuscoli</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>Caratteri Minuscoli (cambia Caratteri Maiuscoli)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>Impostazioni Inserimento Calligrafia</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>Profilo Carattere:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferenze</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare le informazioni.
 Libera dello spazio
 e ritenta.
 
 Esci lo stesso?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqjumpx.ts b/i18n/it/libqjumpx.ts
index 80ea414..2c49958 100644
--- a/i18n/it/libqjumpx.ts
+++ b/i18n/it/libqjumpx.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InputMethods</name>
     <message>
         <source>JumpX</source>
-        <translation type="unfinished"></translation>
+        <translation>JumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqkeyboard.ts b/i18n/it/libqkeyboard.ts
index 318758e..7a72d45 100644
--- a/i18n/it/libqkeyboard.ts
+++ b/i18n/it/libqkeyboard.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastiera</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqkjumpx.ts b/i18n/it/libqkjumpx.ts
index 964d5dc..00abe5b 100644
--- a/i18n/it/libqkjumpx.ts
+++ b/i18n/it/libqkjumpx.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InputMethods</name>
     <message>
         <source>KJumpX</source>
-        <translation type="unfinished"></translation>
+        <translation>KJumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index 59969a2..4737d44 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -1,900 +1,959 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Lavoro</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Personale</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nuoca Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nuoca Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Modifica Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Applicazione</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorie Vanno Qui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Totali</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controllare le categorie a cui questo documento appartiene.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Inserisci una nuova categoria.  Premi &lt;b&gt;Aggiungi&lt;/b&gt; per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Inserisci una nuova categoria sulla sinistra e premi per aggiungerla alla lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Premi per cancellare la categoria evidenziata.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Spunta per rendere questa proprietà disponibile a tutte le applicazioni.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Spiacente, un&apos;altra applicazione sta
 modificando le categorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Modifica Categorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Mostra Gennaio nell&apos;anno selezionato</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Mostra il mese precedente</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Mostra il mese successivo</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Mostra Dicembre nell&apos;anno selezionato</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Chiudi Selettore File</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Mostra i documenti di questo tipo</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Mostra documenti in questa categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Premi per selezionare un documento dalla lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, o seleziona &lt;b&gt;Nuovo Documento&lt;/b&gt; per creare un nuovo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Tieni premuto per le proprietà del documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Stringa Non Trovata.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Raggiunta la fine, inizio da capo</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Trova cosa:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Inizia Ricerca da:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dic 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Maiuscole/minuscole</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Trova Indietro</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Vista Documento</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Cancellazione file fallita.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia di </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplica</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Copia file fallita.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Spostamento documento fallito.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commento:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Caricamento veloce (consuma memoria)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Il supporto su cui è salvato il documento.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Il nome di questo documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Carica questa applicazione così da renderla istantaneamente disponibile.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Cancella questo documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Crea una copia di questo documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Trasmetti via IrDA questo documento.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Utilizza rotazione personalizzata</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informazioni Proprietario</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci codice</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Impossibile creare il file
 di configurazione per questo
 programma.
 Liberare dello spazio e
 riprovare.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossibile creare i file di avvio.
 Liberare dello spazio prima di
 inserire i dati</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>G</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Sei sicuro di voler cancellare
+        <translation type="obsolete">Sei sicuro di voler cancellare
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Lavoro:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Abitazione:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Indirizzi Email: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Abitazione: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Abitazione: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Abitazione: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Abitazione: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Lavoro: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefono Lavoro: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Lavoro: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Cellulare Lavoro: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Cercapersone Lavoro: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Professione: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Direttore: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Maschile</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femminile</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sesso: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Coniuge: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Compleanno: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Anniversario: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alias: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Società</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefono Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Cellulare Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefono Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Cellulare Abitazione</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Direttore</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Alias</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Figli</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nuovo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Lun</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mer</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Gio</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation>%1 documento</translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation>Cos&apos;è...</translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Premi per chiudere questa finestra.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Premi per spostare la finestra.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Premi per ingrandire al massimo questa finestra.</translation>
     </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Cos&apos;è...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Vuoi veramente eliminare
+ %1?&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation>Gen</translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation>Feb</translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation>Mar</translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation>Apr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Mag</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Giu</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Lug</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Ago</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Set</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Ott</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dic</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 documento</translation>
+    </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Card MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>eseguibile citytime non trovato</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Per scegliere il fuso orario,
 prego installare citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Tutti i %1 file</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqpickboard.ts b/i18n/it/libqpickboard.ts
index 488fb8f..094c0de 100644
--- a/i18n/it/libqpickboard.ts
+++ b/i18n/it/libqpickboard.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libqunikeyboard.ts b/i18n/it/libqunikeyboard.ts
index 4eb9e18..d55c6d0 100644
--- a/i18n/it/libqunikeyboard.ts
+++ b/i18n/it/libqunikeyboard.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/librotateapplet.ts b/i18n/it/librotateapplet.ts
index e9a8374..327ec33 100644
--- a/i18n/it/librotateapplet.ts
+++ b/i18n/it/librotateapplet.ts
@@ -1,13 +1,14 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>RotateApplet</name>
     <message>
         <source>Rotate shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Shortcut Ruota</translation>
     </message>
     <message>
         <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruota</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libscreenshotapplet.ts b/i18n/it/libscreenshotapplet.ts
index 2ed8a9b..929e078 100644
--- a/i18n/it/libscreenshotapplet.ts
+++ b/i18n/it/libscreenshotapplet.ts
@@ -1,57 +1,50 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation type="obsolete">Snapshot</translation>
-    </message>
-    <message>
-        <source>scap</source>
-        <translation type="obsolete">scap</translation>
-    </message>
-    <message>
         <source>Name of screenshot </source>
         <translation>Nome dello screenshot</translation>
     </message>
     <message>
         <source>Delay</source>
-        <translation type="unfinished"></translation>
+        <translation>Ritardo</translation>
     </message>
     <message>
         <source>sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sec</translation>
     </message>
     <message>
         <source>Save named</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva con nome</translation>
     </message>
     <message>
         <source>Save screenshot as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva screenshot come...</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>File</translation>
     </message>
     <message>
         <source>Scap</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Success</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Screenshot was uploaded to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Screenshot trasferito su %1</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Connection to %1 failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione su %1 fallita.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtinykate.ts b/i18n/it/libtinykate.ts
index 332e367..6d864e5 100644
--- a/i18n/it/libtinykate.ts
+++ b/i18n/it/libtinykate.ts
@@ -1,18 +1,24 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si è verificato un error nella creazione
+nel file di configurazione 
+per questo programma.
+
+Liberare dello spazio e
+ritentare.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodayaddressbookplugin.ts b/i18n/it/libtodayaddressbookplugin.ts
index bfa0a11..4bff3b4 100644
--- a/i18n/it/libtodayaddressbookplugin.ts
+++ b/i18n/it/libtodayaddressbookplugin.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Max Linee: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Inserisci il numero massimo di righe che dovranno essere visualizzate per ogni anniversario/compleanno</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Unisci riga dopo X caratteri: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Dopo quanti caratteri le informazioni sull&apos;impegno non devono essere visualizzate</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Giorni da guardare avanti: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Per quanti giorni in avanti dobbiamo cercare</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
+        <translation type="obsolete">Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Imposta Colore Titolo: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>I colori per i titoli !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Imposta Colore Impegno: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Questo colore sarà utilizzato per visualizzare i compleanni/annversari !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Imposta Colore
 &quot;Urgente&quot; sotto </translation>
     </message>
     <message>
         <source> days: </source>
         <translation> giorni: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Questo colore verrà utilizzato se siamo vicino all&apos;evento !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Questo colore verrà utilizzato se il compleanno/anniversario è più vicino dei giorni dati !</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Plugin Rubrica</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi compleanni in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun compleanno in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi anniversari in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun anniversario in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Il database non prevede questo tipo di ricerca ! Aggiorna libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodaydatebookplugin.ts b/i18n/it/libtodaydatebookplugin.ts
index 7e7df52..b80c691 100644
--- a/i18n/it/libtodaydatebookplugin.ts
+++ b/i18n/it/libtodaydatebookplugin.ts
@@ -1,88 +1,147 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>[con allarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Tutto il giorno</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>Mostra luogo</translation>
+        <translation type="obsolete">Mostra luogo</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
+        <translation type="obsolete">Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Mostra note</translation>
+        <translation type="obsolete">Mostra note</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
+        <translation type="obsolete">Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>Mostra solo ultimi
+        <translation type="obsolete">Mostra solo ultimi
  appuntamenti</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>Spunta se devono essere mostrati solo gli appuntamenti dopo l&apos;orario corrente</translation>
+        <translation type="obsolete">Spunta se devono essere mostrati solo gli appuntamenti dopo l&apos;orario corrente</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>Quanti 
+        <translation type="obsolete">Quanti 
 appuntamenti
 devono essere 
 mostrati?</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
+        <translation type="obsolete">Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>Quanti altri giorni</translation>
+        <translation type="obsolete">Quanti altri giorni</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>Quanti altri giorni devono essere nel campo</translation>
+        <translation type="obsolete">Quanti altri giorni devono essere nel campo</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation> giorno(i)</translation>
+        <translation type="obsolete"> giorno(i)</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">solo oggi</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>Configurazione Plugin Agenda</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Mostra luogo</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Nostra note</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Mostra solo appuntamenti successivi</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Spunta se devono essere mostrati solo i successivi appuntamenti</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Mostra orario in linee extra</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>Quanti appuntamenti devono essere mostrati?</translation>
     </message>
     <message>
         <source>only today</source>
         <translation>solo oggi</translation>
     </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Quanti altri giorni devono essere nel campo</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Quanti altri giorni</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>Plugin Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>Nessun altro appuntamento oggi</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>Nessun appuntamento oggi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodaytodolistplugin.ts b/i18n/it/libtodaytodolistplugin.ts
index d8c8131..cacb1ba 100644
--- a/i18n/it/libtodaytodolistplugin.ts
+++ b/i18n/it/libtodaytodolistplugin.ts
@@ -1,41 +1,60 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>Plugin Impegni</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>C&apos;è un &lt;b&gt; 1&lt;/b&gt; nuovo impegno:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Ci sono &lt;b&gt; %1&lt;/b&gt; nuovi impegni: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nessun nuovo impegno</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Imposta il numero massimo di impegni da mostrare</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>impegni mostrati</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Dopo quanti caratteri devono essere tagliati i dettagli dell&apos;impegno</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Taglia la riga dopo X caratteri</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>mostra impegni</translation>
+        <translation type="obsolete">mostra impegni</translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Imposta il numero massimo di impegni da mostrare</translation>
+        <translation type="obsolete">Imposta il numero massimo di impegni da mostrare</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Taglia la riga dopo X caratteri</translation>
+        <translation type="obsolete">Taglia la riga dopo X caratteri</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Dopo quanti caratteri le informazioni sull&apos;impegno devono essere tagliate</translation>
+        <translation type="obsolete">Dopo quanti caratteri le informazioni sull&apos;impegno devono essere tagliate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libtodayweatherplugin.ts b/i18n/it/libtodayweatherplugin.ts
index a9a60e5..98bda7d 100644
--- a/i18n/it/libtodayweatherplugin.ts
+++ b/i18n/it/libtodayweatherplugin.ts
@@ -1,118 +1,118 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
         <translation>Plugin Situazione Metereologica</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
         <translation>inserire identificatore posizione ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
         <translation>Inserire qui il codice a 4 lettere del luogo scelto.  Vai su http://www.nws.noaa.gov/tg/siteloc.shtml per trovare il luogo a te più vicino.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
         <translation>Vai su http://www.nws.noaa.gov/tg/siteloc.shtml per trovare il luogo a te più vicino.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usa unità di metro</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
-        <translation>Clicca qui per selezionare il tipo di unità visualizzata.</translation>
+        <translation>Premi qui per selezionare il tipo di unità visualizzata.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
         <translation>Frequenza di aggiornamento (in minuti):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
         <translation>Seleziona quanto spesso (in minuti) vuoi che il tempo sia aggiornato.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
         <translation>Aggiornamento situazione metereologica.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp: </translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>  Vento: </translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pres: </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
         <translation>Dati sulla situazione metereologica non disponibili.</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/d</translation>
     </message>
     <message>
         <source>E </source>
         <translation>E </translation>
     </message>
     <message>
         <source>NE </source>
         <translation>NE </translation>
     </message>
     <message>
         <source>N </source>
         <translation>N </translation>
     </message>
     <message>
         <source>NW </source>
         <translation>NO </translation>
     </message>
     <message>
         <source>W </source>
         <translation>O </translation>
     </message>
     <message>
         <source>SW </source>
         <translation>SO </translation>
     </message>
     <message>
         <source>S </source>
         <translation>S </translation>
     </message>
     <message>
         <source>SE </source>
         <translation>SE </translation>
     </message>
     <message>
         <source> KPH</source>
         <translation> KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation> MPH</translation>
     </message>
     <message>
         <source> hPa</source>
         <translation> hPa</translation>
     </message>
     <message>
         <source> Hg</source>
         <translation> Hg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libfreetypefactory.ts b/i18n/it/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/hu/libfreetypefactory.ts
+++ b/i18n/it/libtremorplugin.ts
diff --git a/i18n/unmaintained/ja/libwavplugin.ts b/i18n/it/libwavplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/libwavplugin.ts
+++ b/i18n/it/libwavplugin.ts
diff --git a/i18n/it/libwlan.ts b/i18n/it/libwlan.ts
new file mode 100644
index 0000000..77df30c
--- a/dev/null
+++ b/i18n/it/libwlan.ts
@@ -0,0 +1,141 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configurazione Wireless</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modalità</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Specifica &amp;Access Point</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Specifica &amp;Canale</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>tutti</translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation>Infrastruttura</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Gestista</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Abilita Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Impostazioni Chiave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Chiave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Chiave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Chiave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Chiave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Pacchetti non criptati</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accetta</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rifiuta</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Informazioni Interfaccia</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canale</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modalità</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Stazione</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Frequenza</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualità</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Rumore</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Segnale</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libwlanplugin.ts b/i18n/it/libwlanplugin.ts
new file mode 100644
index 0000000..9dc2d06
--- a/dev/null
+++ b/i18n/it/libwlanplugin.ts
@@ -0,0 +1,137 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configurazione Wireless</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modalità</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Specifica &amp;Access Point</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Specifica &amp;Canale</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>tutti</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Abilita Crittografia</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Impostazioni &amp;Chiavi</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Chiave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Chiave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Chiave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Chiave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Pacchetti Non-criptati</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accetta</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rifiuta</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Informazioni Interfaccia</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canale</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modalità</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Stazione</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Velocità</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualità</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Rumore</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Segnale</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/mailit.ts b/i18n/it/mailit.ts
index 68eb895..49a834a 100644
--- a/i18n/it/mailit.ts
+++ b/i18n/it/mailit.ts
@@ -1,531 +1,640 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Allegati</translation>
     </message>
     <message>
         <source>File type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo file</translation>
     </message>
     <message>
         <source>attach...</source>
-        <translation type="unfinished"></translation>
+        <translation>allega...</translation>
+    </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>Allega attachment</translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica Account</translation>
     </message>
     <message>
         <source>Create new Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea nuovo Account</translation>
     </message>
     <message>
         <source>Account name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome account</translation>
     </message>
     <message>
         <source>Your name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Email</source>
-        <translation type="unfinished"></translation>
+        <translation>Email</translation>
     </message>
     <message>
         <source>POP username</source>
-        <translation type="unfinished"></translation>
+        <translation>username POP</translation>
     </message>
     <message>
         <source>POP password</source>
-        <translation type="unfinished"></translation>
+        <translation>password POP</translation>
     </message>
     <message>
         <source>POP server</source>
-        <translation type="unfinished"></translation>
+        <translation>server POP</translation>
     </message>
     <message>
         <source>SMTP server</source>
-        <translation type="unfinished"></translation>
+        <translation>server SMTP</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizza</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensione Mesaggio (k)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
-        <translation type="unfinished"></translation>
+        <translation>In attesa</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Messaggio</translation>
     </message>
     <message>
         <source>Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>Account</translation>
     </message>
     <message>
         <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevi</translation>
     </message>
     <message>
         <source>Edit account</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica account</translation>
     </message>
     <message>
         <source>Delete account</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella account</translation>
     </message>
     <message>
         <source>Send mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia messaggio</translation>
     </message>
     <message>
         <source>Compose</source>
-        <translation type="unfinished"></translation>
+        <translation>Scrivi</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella invio</translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>Da</translation>
     </message>
     <message>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Oggetto</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Inbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Posta in arrivo</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>A</translation>
     </message>
     <message>
         <source>Outbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Posta in uscita</translation>
     </message>
     <message>
         <source>No account selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account selezionato</translation>
     </message>
     <message>
         <source>You must create an account</source>
-        <translation type="unfinished"></translation>
+        <translation>Devi creare un account</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Toolbar principale</translation>
     </message>
     <message>
         <source>getMail</source>
-        <translation type="unfinished"></translation>
+        <translation>ricevi</translation>
     </message>
     <message>
         <source>select account</source>
-        <translation type="unfinished"></translation>
+        <translation>seleziona account</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi per ricevere i messaggi da tutti gli account disponibili.
+ Tieni premuto per selezionare l&apos;account desiderato.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>No account associated</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun account associato</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Non c&apos;è nessun account attivo 
+associato a questo messaggio
+ non può quindi essere scaricato</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Risposta sconosciuta dal server&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;host non trovato&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;connessione rifiutata&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;errore pacchetto socket&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Login fallito
+Controlla username e password&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Ricezione errore</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>OK
+</translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile trovare i file nel 
+messaggio con oggetto: </translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Il messaggio NON è stato inviato</translation>
     </message>
     <message>
         <source>Attachment error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore nell&apos;allegato</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>OK
+</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Scrivi messaggio</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Leggi messaggio</translation>
     </message>
     <message>
         <source>Central view area</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista centrale</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio non scaricato</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Il messaggio che hai selezionato 
+non è ancora stato scaricato.
+ Vuoi procedere ora ?</translation>
+    </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Mailit</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Leggi Posta</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione stabilita</translation>
     </message>
     <message>
         <source>Error Occured</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Retrieving </source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevi </translation>
     </message>
     <message>
         <source>Completing message </source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio in completamento</translation>
     </message>
     <message>
         <source>No new Messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun nuovo messaggio</translation>
     </message>
     <message>
         <source> new messages</source>
-        <translation type="unfinished"></translation>
+        <translation> nuovi messaggi</translation>
     </message>
     <message>
         <source>No new messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun nuovo messaggio</translation>
+    </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>richiesta DNS</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserire qui l&apos;oggetto del messaggio</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserire qui i destinatari</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Se vuoi inviare copie del messaggio inserire qui i destinatari</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Questo pulsante apre il selettore di indirizzi con tutti gli indirizzi di posta della rubrica di OPIE</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserire qui il testo del messaggio</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per mettere in cosa il messaggio</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo è una lista di tutti gli allegati nel messaggio</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Questo è l&apos;elenco della posta in arrivo.
+Qui si trovano i mesaggi ricevuti che possono 
+essere visti premendoci sopra 2 volte.
+L&apos;icona blu degli allegati indica se il messaggio 
+ha allegati.
+</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo è l&apos;elenco della posta in uscita.
+Qui si trovano i messaggi in coda per essere spediti e possono 
+essere controllati premendoci sopra 2 volte.</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
+        <translation>Scegli i destinatari da questa lista</translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Questo pulsante apre il selettore di indirizzi con tutti gli indirizzi di posta della rubrica di Opie</translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Visualizza</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Messaggio</translation>
     </message>
     <message>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Precedente</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Successivo</translation>
     </message>
     <message>
         <source>Attatchments</source>
-        <translation type="unfinished"></translation>
+        <translation>Allegati</translation>
     </message>
     <message>
         <source>Text Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato Testo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Inoltra</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per inoltrare il messaggio selezionato</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Leggi il messaggio predente nella lista</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Leggi il messaggio successivo nella lista</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per aggiungeri allegati nel messaggio</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ci sono 2 modi per visualizzare il messaggio:
+&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; mostra il messaggio come HTML con caratteristiche avanzate (le righe non vengono spezzate)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; mostra il messaggio come testo&lt;/LI&gt;Premi qui per seleziona tra questi 2 modi</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per eliminare il messaggio selezionato</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricezione</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per ricevere il messaggio selezionato</translation>
     </message>
     <message>
         <source>reply</source>
-        <translation type="unfinished"></translation>
+        <translation>rispondi</translation>
     </message>
     <message>
         <source>reply to mail</source>
-        <translation type="unfinished"></translation>
+        <translation>rispondi al messaggio</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per rispondere al messaggio selezionato
+Tieni premuto per avere più opzioni.</translation>
     </message>
     <message>
         <source>Reply all</source>
-        <translation type="unfinished"></translation>
+        <translation>Rispondi a tutti</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per rispondere al messaggio selezionato ed agli indirizzi in CC:</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
+        <translation>richiesta DNS</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione stabilita</translation>
     </message>
     <message>
         <source>Sending: </source>
-        <translation type="unfinished"></translation>
+        <translation>In trasmissione: </translation>
     </message>
     <message>
         <source>Sent </source>
-        <translation type="unfinished"></translation>
+        <translation>Inviati </translation>
     </message>
     <message>
         <source> messages</source>
-        <translation type="unfinished"></translation>
+        <translation> messaggi</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Installa</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per installare l&apos;allegato in Documenti</translation>
+    </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Guarda attatchment</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Attatchment</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Installato</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Messaggio</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aggiungi</translation>
     </message>
     <message>
         <source>Enque mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia messaggio</translation>
     </message>
     <message>
         <source>New mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo messaggio</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>A:</translation>
     </message>
     <message>
         <source>CC:</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Oggetto:</translation>
     </message>
     <message>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Allegato</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per inserire allegati nel messaggio</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo pulsante mette in coda i tuoi messaggi</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi qui per creare un nuovo messaggio</translation>
     </message>
     <message>
         <source>No recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun destinatario</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
+        <translation>A chi vuoi scrivere?</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>OK
+</translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separatore destinatari non corretto</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>I destinatari devono essere separati da ;
+e devono avere indirizzi di posta validi</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separatore copia carbone non corretto</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>I destinatari in CC devono essere separati da ;
+e devono avere indirizzi di posta validi</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation type="unfinished"></translation>
+        <translation>Re: </translation>
     </message>
     <message>
         <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
+        <translation>======inizio messaggio inoltrato da </translation>
     </message>
     <message>
         <source> starts======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation> ======
+
+</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation type="unfinished"></translation>
+        <translation>FWD: </translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>======fine messaggio inoltrato======
+
+</translation>
     </message>
     <message>
         <source> wrote on </source>
-        <translation type="unfinished"></translation>
+        <translation> scritto su </translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>EMail</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/mediummount.ts b/i18n/it/mediummount.ts
index 6fb21e1..dc102d0 100644
--- a/i18n/it/mediummount.ts
+++ b/i18n/it/mediummount.ts
@@ -1,99 +1,96 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
-        <translation>Globale</translation>
+        <source>Medium Mount Settings</source>
+        <translation>Gestione Supporti</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Global</source>
+        <translation>Globale</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Dcouments. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="obsolete">Se un supporto viene inserito in questo dispositivo, Opie vi cercherà dei Documenti. Su supporti molto grandi la ricerca impiegherà più tempo. Puoi scegliere se Opie deve cercare i Documenti in modo globale o in base al supporto. Potrai inoltre riconfigurare ogni supporto.</translation>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Se un supporto viene inserito nel dispositivo Opie tenta di ricercare dei Documenti. Su supporti molto grandi questa operazione può impiegare parecchio tempo. Puoi scegliere se Opie deve effettuare la ricerca globalmente o per singolo supporto. Puoi riconfigurare inoltre ogni supporto.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
         <translation>Abilita controllo sui supporti</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>Usa impostazioni globali</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Quale file multimediale</translation>
+        <translation>Quali file multimediali</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Configura questo supporto.  Le modifiche avranno effetto solo dopo la chiusura dell&apos;applicazione. Per aggiornare il Tab Documenti devi rimuovere ed reinserire il supporto.</translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation>Quake file multimediale</translation>
+        <translation>Quali file multimediali</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>Limita ricerca a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Controlla sempre questo supporto</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/it/mindbreaker.ts b/i18n/it/mindbreaker.ts
index 598d561..7d2e496 100644
--- a/i18n/it/mindbreaker.ts
+++ b/i18n/it/mindbreaker.ts
@@ -1,44 +1,45 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MindBreaker</name>
     <message>
         <source>New Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuova Partita</translation>
     </message>
     <message>
         <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
+        <translation>perc vitt: %1 turni (%2 partite)</translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
         <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Go%1p%2</translation>
     </message>
     <message>
         <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
+        <translation>CorrenteGo%1</translation>
     </message>
     <message>
         <source>Answer%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Risposta%1</translation>
     </message>
     <message>
         <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
+        <translation>Azzera Statistiche</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
+        <translation>Azzero la percentuale di vittorie?</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/netsetup.ts b/i18n/it/netsetup.ts
deleted file mode 100644
index 42993ab..0000000
--- a/i18n/it/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Aggiungi Sevizio di Rete</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>&lt;P&gt;Questi sono i servizi di rete disponibili per essere aggiunti.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Solo un %1 può essere aggiunto. Rimuovi quello corrente, o cambia le sue Proprietà</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Rete</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Rete</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Corrente</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;Questo è lo stato dei servizi di rete attivi.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Servizi</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Aggiungi...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;P&gt;Questi sono i servizi di rete disponibili.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Elimina</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Proprietà</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/networksettings.ts b/i18n/it/networksettings.ts
index b7552a6..63a6db1 100644
--- a/i18n/it/networksettings.ts
+++ b/i18n/it/networksettings.ts
@@ -1,88 +1,136 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi Connessione di Rete</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cancella</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aggiungi</translation>
     </message>
     <message>
         <source>Services</source>
-        <translation type="unfinished"></translation>
+        <translation>Servizi</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni di Rete</translation>
     </message>
     <message>
         <source>Connections</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessioni</translation>
     </message>
     <message>
         <source>s</source>
-        <translation type="unfinished"></translation>
+        <translation>°</translation>
     </message>
     <message>
         <source>t</source>
-        <translation type="unfinished"></translation>
+        <translation>°</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>in</source>
-        <translation type="unfinished"></translation>
+        <translation>in</translation>
     </message>
     <message>
         <source>IP</source>
-        <translation type="unfinished"></translation>
+        <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aggiungi</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">&amp;Informazioni</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Configura</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Elimina</translation>
     </message>
     <message>
         <source>Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Profili</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutti</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Imposta Corrente</translation>
     </message>
     <message>
         <source>Current Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilo Corrente</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo Profilo</translation>
+    </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Lista di impostazioni di rete da cui scegliere</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Aggiungi alla lista una nuova interfaccia.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Start/Stop</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Start e Stop dell&apos;interfaccia corrente, da ulteriori informazioni sull&apos;interfaccia.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configura l&apos;interfaccia corrente</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Rimuovi dalla lista l&apos;interfaccia corrente.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Disconnesso</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Impossibile da rimuovere.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Spiacente</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Selezionare un&apos;altra interfaccia.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/odict.ts b/i18n/it/odict.ts
index 5b587d8..ffdb0e7 100644
--- a/i18n/it/odict.ts
+++ b/i18n/it/odict.ts
@@ -1,127 +1,112 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opzioni</translation>
     </message>
     <message>
         <source>Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Metodo di ricerca</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <source>New</source>
+        <translation>Nuovo</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <source>Change</source>
+        <translation>Cambia</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Dizionario Opie</translation>
     </message>
     <message>
         <source>Query:</source>
-        <translation type="unfinished"></translation>
+        <translation>Query:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <translation>Metodi di ricerca</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;ase sensitive</translation>
     </message>
     <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Parameter</source>
+        <translation>Parametro</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>No dictionary defined</source>
+        <translation>Nessun dizionario definito</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definiscine uno</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancella</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Configuration</source>
+        <translation>Configurazione</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation type="unfinished"></translation>
+        <source>Opie-Dictionary</source>
+        <translation>Dizionario Opie</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation type="unfinished"></translation>
+        <translation>File dizionario</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca</translation>
     </message>
     <message>
         <source>Language 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Linguaggio 1</translation>
     </message>
     <message>
         <source>Decollator</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Language 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Linguaggio 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo Metodo di ricerca</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambia Metodo di ricerca</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/oipkg.ts b/i18n/it/oipkg.ts
deleted file mode 100644
index ffb4cfd..0000000
--- a/i18n/it/oipkg.ts
+++ b/dev/null
@@ -1,369 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation>Installa</translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation>Opzioni ipkg</translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation>-force-depends</translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation>-force-reinstall</translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation>-force-removal-of-essential-packages</translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation>-force-overwrite</translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>Per rimuovere</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation>Per installare</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation>Package Manager</translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation>feed</translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation>ipkgfind&amp;killefiz</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation>documenti</translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation>Pacchetto</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Mostra</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation>Applica</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>Aggiorna</translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Servers</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinazioni</translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation>Sezione:</translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation>Chiudi Sezione</translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation>Sezioni</translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation>Filtro: </translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation>Cancella Trova</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>Chiudi Trova</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation>Filtro</translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation>Cerca:</translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation>Cancella Cerca</translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation>Ricerca</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destinazione: </translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation>Link</translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation>Chiudi Destinazioni</translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation>Operazioni Pacchetti</translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation>Installa</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Rimuovi</translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation>Stato Pacchetti</translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation>Nuova versione, installata</translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation>Nuova versione, non installata</translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation>Vecchia versione, installata</translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation>Vecchia versione, non installata</translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation>Vecchia versione, nuova versione installata</translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation>Nuova versione, vecchia versione installata</translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation>Paccketto</translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="obsolete">Installa su</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Rimuovi</translation>
-    </message>
-    <message>
-        <source>Reinstall</source>
-        <translation type="obsolete">Rinstalla</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation>Nuovo</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation>Server Pacchetti</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation>Destinazione installazione:</translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation>Destinazione linkata su root</translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation>Server usati: (I feed evidenziati sono attivi)</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>Server</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nome:</translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Rimuovi</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nuovo</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>Destinazioni</translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation>link su /</translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation>Rimuovi link</translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation>volatile</translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation>removibile</translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation>
-Fatto.</translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation>Rimuovo</translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation>attendere</translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation>Errore nella rimozione </translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>Installo</translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation>Errore nell&apos;installazione</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation>Descrizione: </translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation>Dimensione: </translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation>altro</translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation>Nome Installazione: </translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation>su</translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation>Nome: </translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation>Link: </translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>Destinazione: </translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation>Stato: </translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished">Installa su</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Rimuovi</translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation>in esecuzione...</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/opie-console.ts b/i18n/it/opie-console.ts
index 9cdeb11..43e2c3a 100644
--- a/i18n/it/opie-console.ts
+++ b/i18n/it/opie-console.ts
@@ -1,855 +1,879 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni parametri di connessione</translation>
     </message>
     <message>
         <source>Settings1</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni1</translation>
     </message>
     <message>
         <source>Settings2</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni2</translation>
     </message>
     <message>
         <source>Init string </source>
-        <translation type="unfinished"></translation>
+        <translation>Stringa di inizializzazione </translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation type="unfinished"></translation>
+        <translation>Stringa di reset </translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefisso chiamata #1 </translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Suffisso chiamata #1 </translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefisso chiamata #2 </translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Suffisso chiamata #2 </translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefisso chiamata #3 </translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Suffisso chiamata #3 </translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation type="unfinished"></translation>
+        <translation>Stringa di connessione </translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
+        <translation>Stringa di hang-up </translation>
     </message>
     <message>
         <source>Dial time </source>
-        <translation type="unfinished"></translation>
+        <translation>Orario composizione </translation>
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
+        <translation>Ritardo prima della ricomposizione </translation>
     </message>
     <message>
         <source>Number of tries </source>
-        <translation type="unfinished"></translation>
+        <translation>Numero di tentativi </translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
+        <translation>DTR drop time (0=no) </translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
+        <translation>Riconoscimento bps auto </translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>No</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sì</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
+        <translation>Modem ha linea DCD </translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
+        <translation>Untag multi-linea </translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
-        <translation type="unfinished"></translation>
+        <translation>O mac address</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>Modifica Profilo Connessione</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Nuova Connessione</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Configura</translation>
     </message>
     <message>
         <source>Profile Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome Profilo</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aggiungi</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Modifica</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rimuovi</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Comando da eseguire</translation>
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Variabili Ambientali</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valore</translation>
     </message>
     <message>
         <source>Name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome :</translation>
     </message>
     <message>
         <source>Value :</source>
-        <translation type="unfinished"></translation>
+        <translation>Valore :</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci numero</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci il numero da chiamare. Quando terminato, premi ok</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor Configurazione</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emulazione Terminale:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Layer IO:</translation>
     </message>
     <message>
         <source>Look</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="unfinished"></translation>
+        <translation>Primo piano:</translation>
     </message>
     <message>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Nero</translation>
     </message>
     <message>
         <source>White</source>
-        <translation type="unfinished"></translation>
+        <translation>Bianco</translation>
     </message>
     <message>
         <source>Gray</source>
-        <translation type="unfinished"></translation>
+        <translation>Grigio</translation>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sfondo:</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>Font:</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished"></translation>
+        <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Piccolo</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Medio</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile avviare</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile effettuare fork</translation>
     </message>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Impossibile avviare</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensioni</translation>
     </message>
     <message>
         <source>Edit Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica Tasto</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocità</translation>
     </message>
     <message>
         <source>Flow control</source>
-        <translation type="unfinished"></translation>
+        <translation>Controllo di flusso</translation>
     </message>
     <message>
         <source>Hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessuno</translation>
     </message>
     <message>
         <source>Parity</source>
-        <translation type="unfinished"></translation>
+        <translation>Parità</translation>
     </message>
     <message>
         <source>Odd</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispari</translation>
     </message>
     <message>
         <source>Even</source>
-        <translation type="unfinished"></translation>
+        <translation>Pari</translation>
     </message>
     <message>
         <source>Data Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Data Bit</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Stop Bit</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
-        <translation type="unfinished"></translation>
+        <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>115200 baud</translation>
     </message>
     <message>
         <source>57600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>57600 baud</translation>
     </message>
     <message>
         <source>38400 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>38400 baud</translation>
     </message>
     <message>
         <source>19200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>19200 baud</translation>
     </message>
     <message>
         <source>9600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>9600 baud</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Non connesso</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Baud rate invalido</translation>
     </message>
     <message>
         <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo già connesso</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Configura Profili</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuova Connessione</translation>
     </message>
     <message>
         <source>Save Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva Connessione</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Connetti</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Disconnetti</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
+        <translation>QuickLaunch</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
+        <translation>Il pulsante della shell lancia il profilo &quot;predefinito&quot;. Se non esiste saranno utilizzati i valori predefiniti</translation>
     </message>
     <message>
         <source>Transfer file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Trasferisci file...</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>A capo automatico</translation>
     </message>
     <message>
         <source>Full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Schermo intero</translation>
     </message>
     <message>
         <source>Save history</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva cronologia</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Termina</translation>
     </message>
     <message>
         <source>Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi Finestra</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Esegui Script</translation>
     </message>
     <message>
         <source>Record Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Registra Script</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri Tastiera...</translation>
     </message>
     <message>
         <source>New from Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo da Profilo</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation type="unfinished"></translation>
+        <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Incolla</translation>
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Non Connesso.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Cronologia</translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nuovo Profilo</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation>Salva Profilo</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem collegato a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci numero telefonico:</translation>
     </message>
     <message>
         <source>AT commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Comandi AT</translation>
     </message>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci numero</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo plugin non supporta nessuna configurazione</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
+        <source>New Profile</source>
+        <translation>Nuovo Profilo</translation>
+    </message>
+    <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminale</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione automatica dopo il caricamento</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Console Locale</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Console Opie</translation>
     </message>
     <message>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallita</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione fallita per questa sessione.</translation>
     </message>
     <message>
         <source>Session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sessione fallita</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Impossibile aprire la sessione: Non sono stati trovati tutti i componenti.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modalità traferimento</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia</translation>
     </message>
     <message>
         <source>Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevi</translation>
     </message>
     <message>
         <source>Send file</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia file</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Protocollo di trasferimento</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Stato di avanzamento</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Stato</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Pronto</translation>
     </message>
     <message>
         <source>Start transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Inizio trasferimento</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella</translation>
     </message>
     <message>
         <source>File transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Trasferimento File</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation type="unfinished"></translation>
+        <translation>Attenzione</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Non è stato specificato alcun file.</translation>
     </message>
     <message>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>In trasmissione...</translation>
     </message>
     <message>
         <source>Receiving...</source>
-        <translation type="unfinished"></translation>
+        <translation>In ricezione...</translation>
     </message>
     <message>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancellato</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il trasferimento file è stato cancellato.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Operazione non supportata.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il Trasferimento non può essere iniziato.</translation>
     </message>
     <message>
         <source>No error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nessun errore.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si è verificato un errore indefinito.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Trasferimento non completato.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Si è verificato un errore sconosciuto.</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Invia</translation>
     </message>
     <message>
         <source>File has been sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il file è stato inviato.</translation>
     </message>
     <message>
         <source>Received</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevuto</translation>
     </message>
     <message>
         <source>File has been received.</source>
-        <translation type="unfinished"></translation>
+        <translation>Il file è stato ricevuto.</translation>
     </message>
     <message>
         <source>Profile name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome profilo</translation>
     </message>
     <message>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilo</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminale</translation>
     </message>
     <message>
         <source>Special Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Tasti Speciali</translation>
     </message>
     <message>
         <source>Invalid profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilo non valido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci un nome per il profilo.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation>Seriale</translation>
     </message>
     <message>
         <source>Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Console Locale</translation>
     </message>
     <message>
         <source>Default Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminale Predefinito</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastiera Predefinita</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>File Sincronizzato</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Numero in composizione: %1</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Fallita</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Composizione del numero fallita.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancellazione...</translation>
     </message>
     <message>
         <source>Searching modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inizializzazione...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
+        <translation>Reset speaker</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Disabilitazione toni</translation>
     </message>
     <message>
         <source>Dial number</source>
-        <translation type="unfinished"></translation>
+        <translation>Componi numero</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
-        <translation type="unfinished"></translation>
+        <translation>Linea occupata, ricomposizione numero</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione stabilita</translation>
     </message>
     <message>
         <source>Dismiss</source>
-        <translation type="unfinished"></translation>
+        <translation>Esci</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo Terminale</translation>
     </message>
     <message>
         <source>Color scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Schema colore</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensione Font</translation>
     </message>
     <message>
         <source>small</source>
-        <translation type="unfinished"></translation>
+        <translation>piccolo</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>medio</translation>
     </message>
     <message>
         <source>large</source>
-        <translation type="unfinished"></translation>
+        <translation>grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
+        <translation>Conversioni line-break</translation>
     </message>
     <message>
         <source>Inbound</source>
-        <translation type="unfinished"></translation>
+        <translation>In arrivo</translation>
     </message>
     <message>
         <source>Outbound</source>
-        <translation type="unfinished"></translation>
+        <translation>In uscita</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opzioni</translation>
     </message>
     <message>
         <source>Local echo</source>
-        <translation type="unfinished"></translation>
+        <translation>Echo locale</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>A capo automatico</translation>
     </message>
     <message>
         <source>VT 100</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Console Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminale X</translation>
     </message>
     <message>
         <source>black on white</source>
-        <translation type="unfinished"></translation>
+        <translation>nero su bianco</translation>
     </message>
     <message>
         <source>white on black</source>
-        <translation type="unfinished"></translation>
+        <translation>bianco su nero</translation>
     </message>
     <message>
         <source>green on black</source>
-        <translation type="unfinished"></translation>
+        <translation>verde su nero</translation>
     </message>
     <message>
         <source>orange on black</source>
-        <translation type="unfinished"></translation>
+        <translation>arancione su nero</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opie-login.ts b/i18n/it/opie-login.ts
index 3640074..33107b1 100644
--- a/i18n/it/opie-login.ts
+++ b/i18n/it/opie-login.ts
@@ -1,88 +1,101 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tocca le croci accuratamente e
 con fermezza per tarare lo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Autenticazione</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Benvenuto in OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utente</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Sospendi</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La password inserita non è corretta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>OPIE è stato terminato
+        <translation type="obsolete">OPIE è stato terminato
 da un segnale
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>Impossibile inizializzare OPIE.</translation>
+        <translation type="obsolete">Impossibile inizializzare OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Impossibile cambiare utente</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>Opie è stato terminato
+da un segnale
+(%1)</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>Impossibile inizializzare Opie.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/opie-sheet.ts b/i18n/it/opie-sheet.ts
deleted file mode 100644
index 9fe1f4b..0000000
--- a/i18n/it/opie-sheet.ts
+++ b/dev/null
@@ -1,798 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation>&amp;Bordi</translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation>&amp;Sfondo</translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation>&amp;Font</translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation>&amp;Allineamento</translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation>&amp;Larghezza:</translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation>&amp;Colore:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation>&amp;Bordi Predefiniti</translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation>&amp;Stile:</translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation>&amp;Sfondo Predefinito</translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation>&amp;Font:</translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation>&amp;Dimensione:</translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation>&amp;Grassetto</translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation>&amp;Corsivo</translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation>&amp;Font Predefinito</translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation>&amp;Verticale:</translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation>&amp;Orizzontale:</translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation>&amp;A Capo Automatico</translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation>&amp;Allineamento Predefinito</translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation>Formato Celle</translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Opie Sheet</translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Trova &amp;&amp; Sostituisci</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Opzioni</translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation>&amp;Cerca:</translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation>&amp;Sostituisci con:</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation>&amp;Trova</translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation>&amp;Sostituisci</translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation>Sostituisci &amp;tutti</translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation>&amp;Maiuscole/minuscole</translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation>Solo &amp;selezione corrente</translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation>&amp;Tutta la cella</translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation>Trova &amp; Sostituisci</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation>Opie Sheet</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation>Errore di incoerenza!</translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation>Impossibile salvare il file!</translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation>Impossibile aprire il file!</translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation>Formato file invalido!</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Salva</translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation>Vuoi salvare il file corrente?</translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation>&amp;Nome:</translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation>File senza nome</translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation>Nuovo</translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation>&amp;Nuovo</translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation>Apri</translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation>&amp;Apri</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Salva</translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation>Salva con nome</translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation>S&amp;alva con nome</translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation>Informazioni su Opie Sheet</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation>Accetta</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation>&amp;Accetta</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancella</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancella</translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation>Selezione Cella</translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation>&amp;Selezione Cella</translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation>Taglia Celle</translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation>T&amp;aglia</translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation>Copia Celle</translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation>&amp;Copia</translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation>Incolla Celle</translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation>&amp;Incolla</translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation>Incolla Contenuti</translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation>Incolla Cont&amp;enuti</translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation>Pulisci Celle</translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation>P&amp;ulisci</translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation>Inserisci Celle</translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation>C&amp;elle</translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation>Inserisci Righe</translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation>&amp;Righe</translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation>Inserisci Colonne</translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation>&amp;Colonne</translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation>Aggiungi Fogli</translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation>&amp;Fogli</translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation>Celle</translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation>&amp;Celle</translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation>Altezza Riga</translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation>A&amp;ltezza</translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation>Adatta Riga</translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation>&amp;Adatta</translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation>Mostra Riga</translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation>&amp;Mostra</translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation>Nascondi Riga</translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation>&amp;Nascondi</translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation>Larghezza Colonna</translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation>&amp;Larghezza</translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation>Adatta Colonna</translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation>Mostra Colonna</translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation>Nascondi Colonna</translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation>Rinomina Foglio</translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation>&amp;Rinomina</translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation>Elimina Foglio</translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation>E&amp;limina</translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation>Ordina Dati</translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordina</translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation>Trova &amp;&amp; Sostituisci</translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation>&amp;Trova &amp;&amp; Sostituisci</translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation>Uguale A</translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation>&amp;Uguale A</translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation>Somma</translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation>&amp;Somma</translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation>Sottrazione</translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation>&amp;Sottrazione</translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation>Moltiplicazione</translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation>&amp;Moltiplicazione</translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation>Divisione</translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation>&amp;Divisione</translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation>Apri ParentesitempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation>&amp;Apri Parentesi</translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation>Chiusi Parentesi</translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation>&amp;Chiudi Parentesi</translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation>Virgola</translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation>&amp;Virgola</translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation>&amp;File</translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;Modifica</translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation>&amp;Inserisci</translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation>&amp;Formato</translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation>&amp;Data</translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation>&amp;Riga</translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation>Colon&amp;na</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation>&amp;Foglio</translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation>&amp;Funzione</translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation>&amp;Standard</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation>Somma</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation>&amp;Somma</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation>Valore Assoluto</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation>&amp;Valore Assoluto</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation>Seno</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation>Se&amp;no</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation>Arc Seno</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation>A&amp;rc Seno</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation>Coseno</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation>&amp;Coseno</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation>ArcCoseno</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation>Arc Cos&amp;eno</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation>Tangente</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation>&amp;Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation>Arc Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation>Arc Tan&amp;gente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation>Arc Tangente delle Coordinate</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation>&amp;Arc Tangente Coordinate</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation>Esponenziale</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation>&amp;Esponenziale</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation>Logaritmo</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation>&amp;Logaritmo</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation>Potenza</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation>&amp;Potenza</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation>&amp;Matematica</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation>Media</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation>&amp;Media</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation>Massimo</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation>Ma&amp;ssimo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation>Minimo</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation>&amp;Minimo</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation>Calcolo</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation>&amp;Calcolo</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation>&amp;Statistica</translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation>Funzioni</translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation>&amp;Numero di righe:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation>&amp;Numero di colonne:</translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation>&amp;Numero di fogli:</translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation>Foglio</translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation>&amp;Altezza di ogni riga:</translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation>&amp;Larghezza di ogni colonna:</translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation>&amp;Nome Foglio:</translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation>C&apos;è un solo foglio!</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Sei sicuro?</translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation>&amp;Tipo</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation>Sposta celle in &amp;basso</translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation>Sposta celle a &amp;destra</translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation>Tutta la &amp;riga</translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation>Tutta la &amp;colonna</translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation>Opie Sheet
-Foglio di Calcolo per Opie
-Vincitore QWDC Beta (come Sheet/Qt)
-
-Creato da: Serdar Ozler
-Versione 1.0.2
-Data Versione: 08 Ottobre 2002
-
-Questo prodotto è sotto licenza GPL. E&apos; possibile distribuirlo gratuitamente. Per l&apos;ultima versione ed il codice sorgente, visitate il sito web:
-
-http://qtopia.sitebest.com</translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation>Errore di sintassi!</translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation>Chiave di ricerca non trovata!</translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation>&amp;Ordina</translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation>&amp;Opzioni</translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation>&amp;Ordina per</translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation>&amp;Poi per</translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation>Poi &amp;per</translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation>&amp;Maiuscole/minuscole</translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation>&amp;Direzione</translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation>&amp;Dall&apos;alto in basso (colonne)</translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation>&amp;Da sinistra a destra (colonne)</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordina</translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation>&amp;Ascendente</translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation>&amp;Discendente</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation>Una singola cella non può essere ordinata!</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/opie-write.ts b/i18n/it/opie-write.ts
index be81c52..51e7c8e 100644
--- a/i18n/it/opie-write.ts
+++ b/i18n/it/opie-write.ts
@@ -1,116 +1,117 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>File</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Annulla</translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Ripeti</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Taglia</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Incolla</translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Grassetto</translation>
     </message>
     <message>
         <source>Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>Corsivo</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Corsivo</translation>
     </message>
     <message>
         <source>Underline</source>
-        <translation type="unfinished"></translation>
+        <translation>Sottolineato</translation>
     </message>
     <message>
         <source>&amp;Underline</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sottolineato</translation>
     </message>
     <message>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinistra</translation>
     </message>
     <message>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Centrato</translation>
     </message>
     <message>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Destra</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Completo</translation>
     </message>
     <message>
         <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Rich Text Editor</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <translation>Senza nome</translation>
     </message>
 </context>
 <context>
     <name>QTextEdit</name>
     <message>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Undo</translation>
     </message>
     <message>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Redo</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta&amp;glia</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Copia</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Incolla</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona Tutto</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opieftp.ts b/i18n/it/opieftp.ts
index c2f36cf..32db3ef 100644
--- a/i18n/it/opieftp.ts
+++ b/i18n/it/opieftp.ts
@@ -1,254 +1,250 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Connessione</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Locale</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Remota</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Connetti</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Disconnetti</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Crea Directory</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Cambia su Remoto</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Cambia su Config</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Dir</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Username</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Server remoto</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Path remoto</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Config</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Imposta le info del server</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Impossibile connettersi a
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Impossibile autenticarsi su
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Impossibile fare l&apos;upload di
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Impossibile fare l&apos;upload delle directory</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Impossibile fare il download di
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Impossibile visualizzare elenco file di
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Impossibile cambiare directory
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Impossibile salire di livello
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Impossibile ottenere la directory di lavoro
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Cambia Directory</translation>
     </message>
     <message>
         <source>Rescan</source>
         <translation>Riesamina</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Vuoi veramente eliminare
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 Deve essere vuota</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Impossibile creare directory
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Impossibile eliminare directory
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Impossibile eliminare file
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Impossibile rinominare file
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Questa directory non esiste</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nuovo Server</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Nome già esistente</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opieirc.ts b/i18n/it/opieirc.ts
index 33ef781..96b3491 100644
--- a/i18n/it/opieirc.ts
+++ b/i18n/it/opieirc.ts
@@ -1,510 +1,517 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
+        <translation>In conversazione nel canale</translation>
     </message>
     <message>
         <source>Channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema del canale</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Digita qui il tuo messaggio per partecipare alla discussione nel canale</translation>
     </message>
     <message>
         <source>CTCP</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
-        <translation type="unfinished"></translation>
+        <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versione</translation>
     </message>
     <message>
         <source>Whois</source>
-        <translation type="unfinished"></translation>
+        <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
-        <translation type="unfinished"></translation>
+        <translation>Connesso, accesso in corso ..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Accesso avvenuto.</translation>
     </message>
     <message>
         <source>Socket error : </source>
-        <translation type="unfinished"></translation>
+        <translation>Errore di socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione terminata</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione ad un canale inesistente - non sicronizzato?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Utente già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Sei già presente nel canale - non sincronizzato?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Utente non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Canale non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio al canale con mittente sconosciuto</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevuto PRIVMSG di tipo sconosciuto</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
+        <translation>Nickname di un utente sconosciuto modificato</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Utente sconsciuto uscito - non sincronizzato?</translation>
     </message>
     <message>
         <source> changed topic to </source>
-        <translation type="unfinished"></translation>
+        <translation>modifica tema con</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tema canale sconosciuto - non sincronizzato?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevuto un CTCP PING da </translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
+        <translation>Ricevuto un CTCP VERSION da </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION con destinatario errato</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo sconosciuto per cambio modalità</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambio modalità con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambio modalità con parametro sconosciuto</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambio modalità con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Modalità dell&apos;utente non ancora supportati</translation>
     </message>
     <message>
         <source>You were kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>Sei stato scacciato da </translation>
     </message>
     <message>
         <source> by </source>
-        <translation type="unfinished"></translation>
+        <translation> da </translation>
     </message>
     <message>
         <source> was kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation> è stato scacciato da </translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Utente sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Canale sconosciuto scacciato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggio server con canale sconosciuto</translation>
     </message>
     <message>
         <source>You joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Sei entrato nel canale </translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Questo nickname è già utilizzato, riconnettersi utilizzando un nickname diverso</translation>
     </message>
     <message>
         <source>No such nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Nickname sconosciuto</translation>
+    </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Ricevuto comando numerico sconosciuto: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Ricevuto comando ctcp sconosciuto: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Ricevuto comando alfabetico sconosciuto: %1</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>%1 è entrato nel canale %2</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>Hai lasciato il canale %1</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>%1 ha lasciato il canale %2</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>Messaggio canale con canale sconosciuto %1</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>Sei conosciuto ora come %1</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 è ora conosciuto come %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 è uscito (%2)</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
-        <translation type="unfinished"></translation>
+        <translation>In conversazione con </translation>
     </message>
     <message>
         <source>Private discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Conversazione privata</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
-        <translation type="unfinished"></translation>
+        <translation>Digita qui il tuo messaggio da inviare ad un&apos;altra persona</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Disconnesso</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome profilo :</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
-        <translation type="unfinished"></translation>
+        <translation>Il nome del profilo di questo server</translation>
     </message>
     <message>
         <source>Hostname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostname :</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>Il server a cui connettersi - può essere un qualunque IP o nome host valido</translation>
     </message>
     <message>
         <source>Port :</source>
-        <translation type="unfinished"></translation>
+        <translation>Porta :</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
-        <translation type="unfinished"></translation>
+        <translation>La porta del server a cui connettersi. Normalmente la 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nickname :</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
-        <translation type="unfinished"></translation>
+        <translation>Il tuo alias sul network IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome reale :</translation>
     </message>
     <message>
         <source>Your real name</source>
-        <translation type="unfinished"></translation>
+        <translation>Il tuo nome reale</translation>
     </message>
     <message>
         <source>Password :</source>
-        <translation type="unfinished"></translation>
+        <translation>Password :</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
-        <translation type="unfinished"></translation>
+        <translation>La password per connettersi al server (se richiesta)</translation>
     </message>
     <message>
         <source>Channels :</source>
-        <translation type="unfinished"></translation>
+        <translation>Canali :</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista di tutti i canali (separati da virgola) a cui vuoi connetterti automaticamente</translation>
     </message>
     <message>
         <source>Edit server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica informazioni del server</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Profile name required</source>
-        <translation type="unfinished"></translation>
+        <translation>E&apos; richiesto un nome profilo</translation>
     </message>
     <message>
         <source>Host name required</source>
-        <translation type="unfinished"></translation>
+        <translation>E&apos; richiesto un hostname</translation>
     </message>
     <message>
         <source>Port required</source>
-        <translation type="unfinished"></translation>
+        <translation>E&apos; richiesta una porta</translation>
     </message>
     <message>
         <source>Nickname required</source>
-        <translation type="unfinished"></translation>
+        <translation>E&apos; richiesto un nickname</translation>
     </message>
     <message>
         <source>Realname required</source>
-        <translation type="unfinished"></translation>
+        <translation>E&apos; richiesto un nome reale</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>La lista canali contine una lista di canali
+separati da virgola che iniziato con &apos;#&apos;
+o &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Browser lista server</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona un profilo server</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleziona da questa lista un profilo server e premi OK in alto a destra</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina il profilo server corrente</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Modifica il profilo server corrente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi un nuovo profilo server</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessione a</translation>
     </message>
     <message>
         <source>Server messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Messaggi del server</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
-        <translation type="unfinished"></translation>
+        <translation>Digita qui i comandi. Nella guida di OpieIRC puoi trovare una lista di comandi disponibili</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
-        <translation type="unfinished"></translation>
+        <translation>Linee visualizzate :</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
-        <translation type="unfinished"></translation>
+        <translation>Numero di righe visualizzate nelle chat prima che le righe più vecchie vengano cancellate - è necessario per limitare l&apos;occupazione di memoria. Imposta a 0 se non ne hai bisogno</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Generale</translation>
     </message>
     <message>
         <source>Background color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore sfondo :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore dello sfondo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Normal text color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore testo normale :</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore del testo da utilizzare nelle chat</translation>
     </message>
     <message>
         <source>Error color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore errore :</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore da utilizzare per visualizzare gli errori</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
-        <translation type="unfinished"></translation>
+        <translation>Testo scritto da te :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore da utilizzare per evidenziare il testo scritto da te</translation>
     </message>
     <message>
         <source>Text written by others :</source>
-        <translation type="unfinished"></translation>
+        <translation>Testo scritto da altri :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore da utilizzare per evidenziare il testo scritto da altri</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
-        <translation type="unfinished"></translation>
+        <translation>Testo scritto dal server :</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore da utilizzare per evidenziare il testo scritto dal server</translation>
     </message>
     <message>
         <source>Notifications :</source>
-        <translation type="unfinished"></translation>
+        <translation>Notifiche :</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Colore da utilizzare per evidenziare le notifiche</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Colori</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrizione mancante</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrizione del contenuto del tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi questo tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation type="unfinished"></translation>
+        <translation>Client IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
+        <translation>Connessioni al server, canali, query ed altre cose saranno posizionate qui</translation>
     </message>
     <message>
         <source>IRC</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuova connessione</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Crea una nuova connessione ad un server IRC</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Configura impostazioni di OpieIRC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opieplayer.ts b/i18n/it/opieplayer.ts
index 2912e02..8ddb52c 100644
--- a/i18n/it/opieplayer.ts
+++ b/i18n/it/opieplayer.ts
@@ -1,273 +1,277 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>C&apos;è qualche problema
 con il sound device.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Chiusura player.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Interrompi</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Nessun File</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Errore: Non è stato selezionato alcun file</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>File non trovato</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>Impossibile trovare il file: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>Nessun decoder trovato</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Non è stato trovato alcun decoder adatto a questo file: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Errore nell&apos;apertura del file</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Errore nell&apos;eseguire il file: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation> File: </translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, Lunghezza: </translation>
     </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Selezione Playlist</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>Operazioni Play</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>Aggiungi alla Playlist</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Rimuovi dalla Playlist</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Randomize</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>Loop</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Cancella Lista</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Aggiungi tutti i file audio</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>Aggiungi tutti i file video</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Aggiungi tutti i file</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>Salava Playlist</translation>
     </message>
     <message>
-        <source>Export playlist to m3u</source>
-        <translation>Esporta playlist come m3u</translation>
-    </message>
-    <message>
         <source>Open File or URL</source>
         <translation>Apri File o URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>Ricerca File Audio</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Ricerca File Video</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Scala</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Muovi Giù</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Media</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Liste</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>OpiePlayer: </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Spazio esaurito</translation>
+        <translation type="obsolete">Spazio esaurito</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>Errore nel salvare la playlist.
+        <translation type="obsolete">Errore nel salvare la playlist.
 Potrebbero mancare delle voci
 al prossimo avvio.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>File Non Valido</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Errore nell&apos;aprire il file.</translation>
     </message>
     <message>
-        <source>Save Playlist</source>
-        <translation>Salva Playlist</translation>
-    </message>
-    <message>
         <source>Remove Playlist?</source>
         <translation>Elimino Playlist?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>Vuoi veramente cancellare
 questa playlist?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Proprietà</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Play File Selezionati</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Apri file o URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Salva Playlist come m3u</translation>
     </message>
+    <message>
+        <source>Skins</source>
+        <translation>Skins</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation>Path</translation>
+    </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/opierec.ts b/i18n/it/opierec.ts
new file mode 100644
index 0000000..3d4ad68
--- a/dev/null
+++ b/i18n/it/opierec.ts
@@ -0,0 +1,213 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avanti</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>OpieRecord </translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Orario</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>File</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation>Freq. Campionamento</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>Dimensione Limite</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Illimitata</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>Directory File</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>Profondità di Bit</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Out</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opzioni</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>Spazio Disco Basso</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>Si sta esaurendo lo spazio per
+la registrazione oppure una
+scheda non è stata riconosciuta</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> secondi</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>Vuoi veramente &lt;font size=+2&gt;&lt;B&gt;CANCELLARE&lt;/B&gt;&lt;/font&gt;
+il file selezionato?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>Impossibile rimuovere il file.</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>Opierec</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>Seleziona il file da riprodurre</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Nota</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>Impossibile aprire il file audio.
+</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Riproduci</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>Invia con Ir</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Rinomina</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>Invia via Ir</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>Invio Ir effettuato.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>Registra</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Ubicazione</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>Compressione (file più piccoli)</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>Mute automatico</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>mute</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Stop</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/osearch.ts b/i18n/it/osearch.ts
new file mode 100644
index 0000000..0c44637
--- a/dev/null
+++ b/i18n/it/osearch.ts
@@ -0,0 +1,124 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>OSearch</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Dettagli selezione corrente</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Applicazioni</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documenti</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Attività</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Agenda</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Contatti</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Cerca tutto</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opzioni</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Cse sensitive</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Usa wildcards</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Inserisci qui i termini di ricerca</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Risultati</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show completed tasks</source>
+        <translation>mostra attività terminate</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>mostra eventi passati</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>cerca nei giorni</translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation>mostra</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>modifica</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>esegui</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>aprin nel filemanager</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>File: </translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Link: </translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>Mimetype: </translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>apri con</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>cerca contenuto</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>in ricerca %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/oxygen.ts b/i18n/it/oxygen.ts
index f5564da..26093b4 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -1,567 +1,563 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcola</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecolare</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecolare (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composizione Molecolare (%):</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formula Chimica</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Peso</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Blocco</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elettronegatività</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raggio atomico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energ. ionizzazione</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densità</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Punto ebollizione</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Punto fusione</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Peso</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Ossigeno</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Calcoli</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Idrogeno</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Elio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Litio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berillio</translation>
     </message>
     <message>
         <source>Boron</source>
         <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbonio</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Azoto</translation>
     </message>
     <message>
         <source>Fluorine</source>
         <translation>Fluoro</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sodio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnesio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Alluminio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silicio</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fosforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
         <translation>Zolfo</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
         <translation>Potassio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Calcio</translation>
     </message>
     <message>
         <source>Scandium</source>
         <translation>Scandio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titanio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanadio</translation>
     </message>
     <message>
         <source>Chromium</source>
         <translation>Cromo</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganese</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Ferro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Nichel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Rame</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinco</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gallio</translation>
     </message>
     <message>
         <source>Germanium</source>
         <translation>Germanio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsenico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selenio</translation>
     </message>
     <message>
         <source>Bromine</source>
         <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
         <translation>Crypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubidio</translation>
     </message>
     <message>
         <source>Strontium</source>
         <translation>Stronzio</translation>
     </message>
     <message>
         <source>Yttrium</source>
         <translation>Ittrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
         <translation>Zirconio</translation>
     </message>
     <message>
         <source>Niobium</source>
         <translation>Niobio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
         <translation>Molibdeno</translation>
     </message>
     <message>
         <source>Technetium</source>
         <translation>Tecnezio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
         <translation>Rutenio</translation>
     </message>
     <message>
         <source>Rhodium</source>
         <translation>Rodio</translation>
     </message>
     <message>
         <source>Palladium</source>
         <translation>Palladio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Argento</translation>
     </message>
     <message>
         <source>Cadmium</source>
         <translation>Cadmio</translation>
     </message>
     <message>
         <source>Indium</source>
         <translation>Indio</translation>
     </message>
     <message>
         <source>Tin</source>
         <translation>Stagno</translation>
     </message>
     <message>
         <source>Antimony</source>
         <translation>Antimonio</translation>
     </message>
     <message>
         <source>Tellurium</source>
         <translation>Tellurio</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iodio</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xeno</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Cesio</translation>
     </message>
     <message>
         <source>Barium</source>
         <translation>Bario</translation>
     </message>
     <message>
         <source>Lanthanum</source>
         <translation>Lantanio</translation>
     </message>
     <message>
         <source>Cerium</source>
         <translation>Cerio</translation>
     </message>
     <message>
         <source>Praseodymium</source>
         <translation>Praseodimio</translation>
     </message>
     <message>
         <source>Neodymium</source>
         <translation>Neodimio</translation>
     </message>
     <message>
         <source>Promethium</source>
         <translation>Promezio</translation>
     </message>
     <message>
         <source>Samarium</source>
         <translation>Samario</translation>
     </message>
     <message>
         <source>Europium</source>
         <translation>Europio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
         <translation>Gadolinio</translation>
     </message>
     <message>
         <source>Terbium</source>
         <translation>Terbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
         <translation>Disprosio</translation>
     </message>
     <message>
         <source>Holmium</source>
         <translation>Olmio</translation>
     </message>
     <message>
         <source>Erbium</source>
         <translation>Erbio</translation>
     </message>
     <message>
         <source>Thulium</source>
         <translation>Tulio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
         <translation>Itterbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
         <translation>Lutezio</translation>
     </message>
     <message>
         <source>Hafnium</source>
         <translation>Afnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
         <translation>Tantalio</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsteno</translation>
     </message>
     <message>
         <source>Rhenium</source>
         <translation>Renio</translation>
     </message>
     <message>
         <source>Osmium</source>
         <translation>Osmio</translation>
     </message>
     <message>
         <source>Iridium</source>
         <translation>Iridio</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platino</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Oro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercurio</translation>
     </message>
     <message>
         <source>Thallium</source>
         <translation>Tallio</translation>
     </message>
     <message>
         <source>Lead</source>
         <translation>Piombo</translation>
     </message>
     <message>
         <source>Bismuth</source>
         <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
         <translation>Polonio</translation>
     </message>
     <message>
         <source>Astatine</source>
         <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
         <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
         <translation>Francio</translation>
     </message>
     <message>
         <source>Radium</source>
         <translation>Radio</translation>
     </message>
     <message>
         <source>Actinium</source>
         <translation>Attinio</translation>
     </message>
     <message>
         <source>Thorium</source>
         <translation>Torio</translation>
     </message>
     <message>
         <source>Protactinium</source>
         <translation>Protoattinio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Uranio</translation>
     </message>
     <message>
         <source>Neptunium</source>
         <translation>Nettunio</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutonio</translation>
     </message>
     <message>
         <source>Americium</source>
         <translation>Americio</translation>
     </message>
     <message>
         <source>Curium</source>
         <translation>Curio</translation>
     </message>
     <message>
         <source>Berkelium</source>
         <translation>Berkelio</translation>
     </message>
     <message>
         <source>Californium</source>
         <translation>Californio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
         <translation>Einsteinio</translation>
     </message>
     <message>
         <source>Fermium</source>
         <translation>Fermio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
         <translation>Mendelevio</translation>
     </message>
     <message>
         <source>Nobelium</source>
         <translation>Nobelio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
         <translation>Laurenzio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
         <translation>Rutherfordio</translation>
     </message>
     <message>
         <source>Dubnium</source>
         <translation>Dubnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
         <translation>Seaborgio</translation>
     </message>
     <message>
         <source>Bohrium</source>
         <translation>Bohrio</translation>
     </message>
     <message>
         <source>Hassium</source>
         <translation>Hassio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
         <translation>Meitnerio</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Tavola Periodica</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>ERRORE: 
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Dati Chimici</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/parashoot.ts b/i18n/it/parashoot.ts
index 0aa33b9..597dbb4 100644
--- a/i18n/it/parashoot.ts
+++ b/i18n/it/parashoot.ts
@@ -1,24 +1,28 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ParaShoot</name>
     <message>
         <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
+        <translation>ParaShoot</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuova Partita</translation>
     </message>
     <message>
         <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
+        <translation>     Livello: %1       Punti: %2   </translation>
     </message>
     <message>
         <source>       GAME OVER!
        Your Score:  %1
  Parachuters Killed: %2
         Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
+        <translation> PARTITA TERMINATA!
+       Punti:  %1
+ Paracadutisti Uccisi: %2
+       Precisione: %3% </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/patience.ts b/i18n/it/patience.ts
index 2808659..f99552e 100644
--- a/i18n/it/patience.ts
+++ b/i18n/it/patience.ts
@@ -1,73 +1,98 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Cambia Retro delle Carte</translation>
+        <translation type="obsolete">&amp;Cambia Retro delle Carte</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Metti In Posizione</translation>
+        <translation type="obsolete">&amp;Metti In Posizione</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Settaggi</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Informazioni</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Gioca</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Cambia Retro delle Carte</translation>
+        <translation type="obsolete">Cambia Retro delle Carte</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Metti In Posizione</translation>
+        <translation type="obsolete">Metti In Posizione</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Gira Una Carta</translation>
+        <translation type="obsolete">Gira Una Carta</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Settaggi</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Gira Tre Carte</translation>
+        <translation type="obsolete">Gira Tre Carte</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Cambia retro delle carte</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Metti in posizione</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Cambia retro delle carte</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Metti in posizione</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Gira una carta</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Gira tre carte</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/qasteroids.ts b/i18n/it/qasteroids.ts
index 7066645..264984d 100644
--- a/i18n/it/qasteroids.ts
+++ b/i18n/it/qasteroids.ts
@@ -1,39 +1,42 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KAstTopLevel</name>
     <message>
         <source>Asteroids</source>
-        <translation type="unfinished"></translation>
+        <translation>Asteroids</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation type="unfinished"></translation>
+        <translation>Punti</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Livello</translation>
     </message>
     <message>
         <source>Ships</source>
-        <translation type="unfinished"></translation>
+        <translation>Astronavi</translation>
     </message>
     <message>
         <source>Fuel</source>
-        <translation type="unfinished"></translation>
+        <translation>Carburante</translation>
     </message>
     <message>
         <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
+        <translation>Premi Agenda per giocare</translation>
     </message>
     <message>
         <source>Ship Destroyed.
 Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
+        <translation>Astronave Distrutta.
+Premi Pulsante Contatti/Home.</translation>
     </message>
     <message>
         <source>Game Over.
 Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
+        <translation>Partita Terminata.
+Premi Agenda per una nuova partita.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/qpdf.ts b/i18n/it/qpdf.ts
index 1601f46..7b3bc3d 100644
--- a/i18n/it/qpdf.ts
+++ b/i18n/it/qpdf.ts
@@ -1,101 +1,106 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
-        <translation>QPdf</translation>
+        <translation>Lettore PDF</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Adatta in larghezza</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Adatta alla pagina</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Apri...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Trova...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Prima Pagina</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Pagina Precedente</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Vai a pagina...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Pagina Successiva</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Ultima Pagina</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Prossima</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Vai a pagina</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Seleziona da 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>Impossibile trovare &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>Il file è inesistente!</translation>
+        <translation type="obsolete">Il file è inesistente!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation>Il file non esiste!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index af5cb1f..10dedec 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,257 +1,258 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Mostra Lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informazione</translation>
+        <translation>Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>Stato Batteria</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca documenti</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Mostra Documento</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>Link applicazioni</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Stato Batteria</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Sospendi</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sync Connessione</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permetti</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancella</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/reader.ts b/i18n/it/reader.ts
index 3842246..ab7896b 100644
--- a/i18n/it/reader.ts
+++ b/i18n/it/reader.ts
@@ -1,308 +1,795 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
+        <source>Toolbar Settings</source>
+        <translation>Impostazioni Toolbar</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
+        <source>File</source>
+        <translation>File</translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
+        <source>Navigation</source>
+        <translation>Navigazione</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Vista</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Segni</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indicatori</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Politiche</translation>
     </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
     <message>
-        <source>On Action...</source>
-        <translation type="unfinished"></translation>
+        <source>Scroll Speed</source>
+        <translation>Velocità Scorrimento</translation>
     </message>
     <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Vuoto&gt;</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Apri file</translation>
     </message>
     <message>
         <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Autoscorrimento</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bookmark</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation type="unfinished"></translation>
+        <source>Annotate</source>
+        <translation>Annota</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Schermo Intero</translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom in</source>
+        <translation>Zoom +</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom out</source>
+        <translation>Zoom -</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation type="unfinished"></translation>
+        <source>Back</source>
+        <translation>Indietro</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <source>Forward</source>
+        <translation>Avanti</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation type="unfinished"></translation>
+        <source>Home</source>
+        <translation>Pagina Principale</translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation type="unfinished"></translation>
+        <source>Page up</source>
+        <translation>Pagina sù</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation type="unfinished"></translation>
+        <source>Page down</source>
+        <translation>Pagina giù</translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
+        <source>Line up</source>
+        <translation>Linea sù</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation type="unfinished"></translation>
+        <source>Line down</source>
+        <translation>Linea giù</translation>
     </message>
     <message>
-        <source>Annotation</source>
-        <translation type="unfinished"></translation>
+        <source>Beginning</source>
+        <translation>Inizio</translation>
     </message>
     <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
+        <source>End</source>
+        <translation>Fine</translation>
     </message>
     <message>
-        <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <source>Escape Button</source>
+        <translation>Pulsante Esc</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
+        <source>Space Button</source>
+        <translation>Pulsante Spazio</translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
+        <source>Return Button</source>
+        <translation>Pulsante Invio</translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <source>Left Arrow</source>
+        <translation>Freccia Sinistra</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation type="unfinished"></translation>
+        <source>Right Arrow</source>
+        <translation>Freccia Destra</translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation type="unfinished"></translation>
+        <source>Down Arrow</source>
+        <translation>Freccia Giù</translation>
     </message>
     <message>
-        <source>Auto</source>
-        <translation type="unfinished"></translation>
+        <source>Up Arrow</source>
+        <translation>Freccia Sù</translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
+        <source>Tidy-up</source>
+        <translation>Ordina</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Elimina Bookmarks</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Configuration</source>
+        <translation>Cancella Configurazione</translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Peanut/PML</source>
-        <translation type="unfinished"></translation>
+        <source>Open</source>
+        <translation>Apri</translation>
     </message>
     <message>
-        <source>Layout</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Due/Un
+Tocco</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Trova</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Annotazione</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>Internazionale</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>Grafico</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Larghezza Grafico</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Applica font
+alle finestre
+di dialogo</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codifica</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Applicazione</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Messaggio</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Due/Un
+Tocco</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dizionario</translation>
     </message>
     <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Scambia
+Azioni Tocco</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
-        <translation type="unfinished"></translation>
+        <translation>Togli CR</translation>
     </message>
     <message>
         <source>Dehyphen</source>
-        <translation type="unfinished"></translation>
+        <translation>Dehyphen</translation>
     </message>
     <message>
         <source>Single Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Spazio Singolo</translation>
     </message>
     <message>
         <source>Unindent</source>
-        <translation type="unfinished"></translation>
+        <translation>Non Indentato</translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
-        <translation type="unfinished"></translation>
+        <source>Reparagraph</source>
+        <translation>Riparagrafa</translation>
     </message>
     <message>
         <source>Double Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Spazio Doppio</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation type="unfinished"></translation>
+        <source>Remap</source>
+        <translation>Rimappa</translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation type="unfinished"></translation>
+        <source>Embolden</source>
+        <translation>Embolden</translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation type="unfinished"></translation>
+        <source>Full Justify</source>
+        <translation>Giustificazione Completa</translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation type="unfinished"></translation>
+        <source>Text</source>
+        <translation>Testo</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation>Indenta</translation>
     </message>
     <message>
-        <source>Embolden</source>
-        <translation type="unfinished"></translation>
+        <source>Page
+Overlap</source>
+        <translation>Pagina
+Sovrapposta</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Zoom
+Immagini</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Margine</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Paragrafo
+Iniziale</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Linea
+Principale</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Markup</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Font</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bookmark</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Annota</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Vai A</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Autogen</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Ordina</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Marca Blocco</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Copia Blocco</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Mobile</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Barra singola</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Menu/tool bar</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Barre multiple</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Alto</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Basso</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Destra</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Sinistra</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Minimizzato</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Mobile</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Annotazione</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dizionario</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Appunti</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Depluck</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>Dejpluck</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Continuo</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Seleziona Azione</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Plucker</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Scorri</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Pagina Iniziale</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avanti</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Pagina Sù</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Pagina Giù</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Vai all&apos;Inizio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Vai alla Fine</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Vai A</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Scorrimento Pagina/Linea</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>Impostazioni OpieReader</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Disposizione</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>DIsposizione(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Lingua</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Varie</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>Pulsanti</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Salva URL</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Appunti</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>File locale</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>File globale</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>Zoom In</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom +</translation>
     </message>
     <message>
         <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom -</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation type="unfinished"></translation>
+        <source>Set Font</source>
+        <translation>Imposta Font</translation>
     </message>
     <message>
-        <source>Set width</source>
-        <translation type="unfinished"></translation>
+        <source>Encoding</source>
+        <translation>Codifica</translation>
     </message>
     <message>
-        <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <source>Ideogram</source>
+        <translation>Grafico</translation>
+    </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
+    <message>
+        <source>Open</source>
+        <translation>Apri</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Schermo Intero</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigazione</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Scorrimento</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation type="unfinished"></translation>
+        <source>Jump</source>
+        <translation>Vai A</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Scorrimento Pagina/Linea</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>Due/Un Tocco</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Annotazione</translation>
     </message>
     <message>
-        <source>UTF-8</source>
-        <translation type="unfinished"></translation>
+        <source>Up</source>
+        <translation>Sù</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation type="unfinished"></translation>
+        <source>Down</source>
+        <translation>Giù</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation type="unfinished"></translation>
+        <source>Find...</source>
+        <translation>Trova...</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom In</source>
+        <translation>Zoom +</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom Out</source>
+        <translation>Zoom -</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Imposta Font</translation>
     </message>
     <message>
         <source>Annotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Annota</translation>
     </message>
     <message>
         <source>Goto</source>
-        <translation type="unfinished"></translation>
+        <translation>Vai A</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Autogen</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordina</translation>
     </message>
     <message>
         <source>Start Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Inizio Blocco</translation>
     </message>
     <message>
         <source>Copy Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia Blocco</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>File</translation>
     </message>
     <message>
         <source>Marks</source>
-        <translation type="unfinished"></translation>
+        <translation>Segni</translation>
     </message>
     <message>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Trova Successivo</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Do Reg</source>
-        <translation type="unfinished"></translation>
+        <translation>Registra</translation>
     </message>
     <message>
         <source>Close Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi Modifica</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Mostra</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configurazione</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Salva Configurazione</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Apri Configurazione</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Cancella Configurazione</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>Toolbar</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Esegui Script</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Esporta Link</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Vai all&apos;Inizio</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Vai alla Fine</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Pagina Iniziale</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avanti</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Scorrimento</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Imposta Destinazione</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Pausa</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Imposta Codifica</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Grafico</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bookmark</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Reader</translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ricerca file</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>Nascosto</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensione</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/rotation.ts b/i18n/it/rotation.ts
deleted file mode 100644
index 9101986..0000000
--- a/i18n/it/rotation.ts
+++ b/dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Inmpostazioni Rotazione</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Seleziona l&apos;orientamento dalle opzioni sulla sinistra.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>Riavvia Opie automaticamente?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;La rotatione non è abilitata in questa demo, comunque questa caratteristica è inclusa in Qt/Embedded.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index 0401526..22ab5fa 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -1,107 +1,119 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Imposta password</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>La password inserita è sbagliata.
 Accesso negato</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Inserisci nuova password</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Rinserisci nuova password</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Impostazioni Sicurezza</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Cancella password</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Richiedi password all&apos;avvio</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (predefinita)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation>1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Login</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Login Automatico</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/sheetqt.ts b/i18n/it/sheetqt.ts
index 6a05307..b07151a 100644
--- a/i18n/it/sheetqt.ts
+++ b/i18n/it/sheetqt.ts
@@ -1,787 +1,798 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bordi</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;fondo</translation>
     </message>
     <message>
         <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Font</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Allineamento</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Larghezza:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Colore:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>Bordo Pre&amp;definito</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Stile:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Sfondo Pre&amp;definito</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Font:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dimensione:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Grassetto</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>Cors&amp;ivo</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Font Pre&amp;definito</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verticale:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Orizzontale:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>A &amp;Capo Automatico</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Allineamento Pre&amp;definito</translation>
     </message>
     <message>
         <source>Format Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato Celle</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Trova &amp;&amp; Sostituisci</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opzioni</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cerca per:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sostituisci con:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Trova</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sostituisci</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>Sostituisci &amp;tutti</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
+        <translation>Confronta &amp;caratteri</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
+        <translation>Solo &amp;selezione corrente</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutta la c&amp;ella</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Trova &amp; Sostituisci</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore di incoerenza!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
+        <translation>Il file non può essere dalvato!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
+        <translation>Il file non può essere aperto!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato file invalido!</translation>
     </message>
     <message>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva File</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vuoi salvare il file corrente?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome &amp;File:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>File senza nome</translation>
     </message>
     <message>
         <source>New File</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo File</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nuovo</translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri File</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Apri</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Salva</translation>
     </message>
     <message>
         <source>Save File As</source>
-        <translation type="unfinished"></translation>
+        <translation>Salva File Come</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;alva Come</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Accetta</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Accetta</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cancella</translation>
     </message>
     <message>
         <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Selettore Celle</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Selettore Celle</translation>
     </message>
     <message>
         <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Taglia Celle</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Taglia</translation>
     </message>
     <message>
         <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Copia Celle</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Copia</translation>
     </message>
     <message>
         <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Incolla Celle</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Incolla</translation>
     </message>
     <message>
         <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Incolla Contenuti</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
+        <translation>Incolla Cont&amp;enuti</translation>
     </message>
     <message>
         <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancella Cells</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
+        <translation>Cance&amp;lla</translation>
     </message>
     <message>
         <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci Celle</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;elle</translation>
     </message>
     <message>
         <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci Righe</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Righe</translation>
     </message>
     <message>
         <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>Inserisci Colonne</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Colonne</translation>
     </message>
     <message>
         <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>Aggiungi Fogli</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fogli</translation>
     </message>
     <message>
         <source>Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Celle</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Celle</translation>
     </message>
     <message>
         <source>Row Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Altezza Riga</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
+        <translation>Alt&amp;ezza</translation>
     </message>
     <message>
         <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Adatta Riga</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Adatta</translation>
     </message>
     <message>
         <source>Show Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra Riga</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mostra</translation>
     </message>
     <message>
         <source>Hide Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Nascondi Riga</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nascondi</translation>
     </message>
     <message>
         <source>Column Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Larghezza Colonna</translation>
     </message>
     <message>
         <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Larghezza</translation>
     </message>
     <message>
         <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Adatta Colonna</translation>
     </message>
     <message>
         <source>Show Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra Colonna</translation>
     </message>
     <message>
         <source>Hide Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Nascondi Colonna</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Rinomina Foglio</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rinomina</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Elimina Foglio</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Elimina</translation>
     </message>
     <message>
         <source>Sort Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordina Dati</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ordina</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Trova &amp;&amp; Sostituisci</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Trova &amp;&amp; Sostituisci</translation>
     </message>
     <message>
         <source>Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>Uguale A</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>Ugual&amp;e A</translation>
     </message>
     <message>
         <source>Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>Somma</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Somma</translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>Sottrazione</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sottrazione</translation>
     </message>
     <message>
         <source>Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>Moltiplicazione</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Moltiplicazione</translation>
     </message>
     <message>
         <source>Division</source>
-        <translation type="unfinished"></translation>
+        <translation>Divisione</translation>
     </message>
     <message>
         <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Divisione</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
+        <translation>Apri Parentesi</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Apri Parentesi</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiudi Parentesi</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Chiudi Parentesi</translation>
     </message>
     <message>
         <source>Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>Virgola</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Virgola</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;File</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Modifica</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Inserisci</translation>
     </message>
     <message>
         <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Formato</translation>
     </message>
     <message>
         <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dati</translation>
     </message>
     <message>
         <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Riga</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
+        <translation>Colo&amp;nna</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Foglio</translation>
     </message>
     <message>
         <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Funzione</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Standard</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>Somma</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Somma</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Valore Assoluto</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Assoluto</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Seno</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
+        <translation>Se&amp;no</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Seno</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;rc Seno</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Coseno</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Coseno</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Coseno</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc C&amp;oseno</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Tangente</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tangente</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangente</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tan&amp;gente</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangente delle Coordinate</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangente C&amp;oordinate</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>Esponenziale</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Esponenziale</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Logaritmo</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logaritmo</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation type="unfinished"></translation>
+        <translation>Potenza</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Potenza</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Matematica</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Media</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Media</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Massimo</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma&amp;ssimo</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimo</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Minimo</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Calcolo</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Calcolo</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Statistica</translation>
     </message>
     <message>
         <source>Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Funzioni</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Informazioni su Opie Sheet</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet
+Software Spreadsheet per Opie
+Vincitore QWDC Beta (come Sheet/Qt)
+
+Sviluppato da: Serdar Ozler
+Versione 1.0.2
+Data Versione: 08 Ottobre 2002
+
+Questo software è sotto licenza GPL. E&apos; liberamente distribuibile. Se vuoi l&apos;ultima versione ed il codice sorgente, visita il sito web.
+
+http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Numero di righe:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Numero di colonne:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Numero di fogli:</translation>
     </message>
     <message>
         <source>Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Foglio</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Altezza di ogni riga:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Larghezza di ogni colonna:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nome Foglio:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
+        <translation>C&apos;è un solo foglio!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sei sicuro?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
+        <translation>Sposta celle in &amp;basso</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
+        <translation>Sposta celle a &amp;destra</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutta la ri&amp;ga</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
+        <translation>Tutta la &amp;colonna</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore di sintassi!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiave di ricerca non trovata!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ordina</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opzioni</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ordina</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Poi per</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
+        <translation>Poi &amp;per</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rispetta caratteri</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Direzione</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dall&apos;alto in basso (righe)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
+        <translation>Da &amp;sinistra a destra (colonne)</translation>
     </message>
     <message>
         <source>Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordina</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ascendente</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Discendente</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
+        <translation>Una cella non può essere ordinata!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/showimg.ts b/i18n/it/showimg.ts
index 7f1d4ef..f2f4675 100644
--- a/i18n/it/showimg.ts
+++ b/i18n/it/showimg.ts
@@ -1,124 +1,159 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
         <translation>Luminosità</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
         <translation>Titolo</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Image Viewer</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Mostra Miniature</translation>
     </message>
     <message>
-        <source>Slideshow</source>
-        <translation>Slideshow</translation>
-    </message>
-    <message>
         <source>Preferences..</source>
         <translation>Impostazioni..</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>Aiuto</translation>
-    </message>
-    <message>
         <source>Image Info ...</source>
         <translation>Info Immagine ...</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Flip Orizzontale</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Flip Verticale</translation>
     </message>
     <message>
         <source>Open ...</source>
         <translation>Apri ...</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Ruota 90</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Ruota 180</translation>
     </message>
     <message>
         <source>Rotate 270</source>
         <translation>Ruota 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
         <translation>Luminosità ...</translation>
     </message>
     <message>
         <source>Black And White</source>
         <translation>Bianco e Nero</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
         <translation>Ingrandisci</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Schermo Intero</translation>
     </message>
     <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation> - Image Viewer</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 colori</translation>
     </message>
     <message>
         <source> True color</source>
         <translation> True color</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha channel</translation>
     </message>
+    <message>
+        <source>Slide show</source>
+        <translation>Slide show</translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation>Fine Slideshow</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation>Slide Show</translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation>Ritardo tra le immagini</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation>Ripeti slideshow</translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation>Mostra immagini in negativo</translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation>Carica immagini ruotate a 90 gradi</translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation>Caricamento veloce immagini</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/snake.ts b/i18n/it/snake.ts
new file mode 100644
index 0000000..b7f740e
--- a/dev/null
+++ b/i18n/it/snake.ts
@@ -0,0 +1,52 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>SnakeGame</name>
+    <message>
+        <source>Snake</source>
+        <translation>Snake</translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation>Nuova Partita</translation>
+    </message>
+    <message>
+        <source>SNAKE!</source>
+        <translation>SNAKE!</translation>
+    </message>
+    <message>
+        <source>Use the arrow keys to guide the
+snake to eat the mouse. You must not
+crash into the walls, edges or its tail.</source>
+        <translation>Usare le frecce direzionali per guidare il
+serpente a mangiare il topolino. Non bisogna
+scontrarsi con i muri, gli angoli o la propria coda.</translation>
+    </message>
+    <message>
+        <source>Press Any Key To Start</source>
+        <translation type="obsolete">Premi un Tasto per Iniziare</translation>
+    </message>
+    <message>
+        <source>     Score :    %1   </source>
+        <translation>     Punti :    %1   </translation>
+    </message>
+    <message>
+        <source>GAME OVER!
+ Your Score: %1</source>
+        <translation>FINE PARTITA!
+ Punti: %1</translation>
+    </message>
+    <message>
+        <source>Press Any Key to Begin a New Game.</source>
+        <translation type="obsolete">Premi un Tasto per Iniziare una Nuova Partita.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Premere un tasto per iniziare</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Premere un tasto per iniziare una nuova partita.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/stockticker.ts b/i18n/it/stockticker.ts
new file mode 100644
index 0000000..4ce35eb
--- a/dev/null
+++ b/i18n/it/stockticker.ts
@@ -0,0 +1,69 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Apri File</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Chiudi</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Indietro</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>Ava&amp;nti</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Home</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Aggiungi Bookmark</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Vai</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Cronologia</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Bookmark</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Avanti</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Ricerca Simbolo</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Inserisci qualcosa da ricercare.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index 9c1e4e5..548e291 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -1,173 +1,299 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Questo grafico rappresenta quanta memoria di questa scheda Compact Flash è attualmente utilizzata.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Questo grafico rappresenta quanto spazio di questo disco rigido è attualmente utilizzato.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Questo grafico rappresenta quanta memoria di questa scheda Secure Digital è attualmente utilizzata.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Questo grafico rappresenta quanta memoria interna (es. memoria Flash) è attualmente utilizzata su questo dispositivo portatile.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Questo grafico rappresenta quanta memoria del disco RAM è attualmente utilizzata.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilizzo CPU applicazione (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilizzo CPU sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation>Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
+    </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
-        <translation>Cacheed (%1 kB)</translation>
+        <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libera (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria Totale: %1 kB</translation>
     </message>
-</context>
-<context>
-    <name>ModulesDetail</name>
     <message>
-        <source>Send</source>
-        <translation>Trasmetti</translation>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation>Questa pagina mostra quanta memoria (es. RAM) è stata allocata su questo dispositivo portatile.
+La memoria è divisa come segue:
+
+1. Usata - memoria utilizzata da Opie e da qualunque altra applicazione in esecuzione.
+2. Buffer - spazio temporaneo utilizzato per aumentare le prestazioni
+3. Cached - informazioni che sono state utilizzate recentemente, ma che non sono ancora state liberate.
+4. Libera - memoria non ancora utilizzata da Opie o da qualunque altra applicazione.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Usato Da</translation>
+        <translation type="obsolete">Usato Da</translation>
+    </message>
+    <message>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <translation>Questa è una lista di tutti i moduli del kernel attualmente caricati su questo dispositivo portatile.
+
+Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per scaricarlo.</translation>
+    </message>
+    <message>
+        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
+        <translation>Selezionare qui un comando e premere il pulsante Invia sulla destra per inviare il comando al modulo sopra evidenziato.</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Invia</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected command to the module selected above.</source>
+        <translation>Premere qui per inviare il comando selezionato al modulo sopra evidenziato.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this module.</source>
+        <translation>Quest&apos;area mostra informazioni dettagliate su questo modulo.</translation>
+    </message>
+    <message>
+        <source>You really want to execute
+</source>
+        <translation type="obsolete">Vuoi veramente eseguire
+</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation>Utilizzato da</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation>Eseguire veramente %1 per questo modulo?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponibile (%1 kB)</translation>
     </message>
 </context>
 <context>
-    <name>ProcessDetail</name>
-    <message>
-        <source>Send</source>
-        <translation>Trametti (%1 kB)</translation>
-    </message>
-</context>
-<context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
     <message>
-        <source>Hard Disk</source>
-        <translation>Hard Disk</translation>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <translation>Questo è l&apos;elenco di tutti i processi su questo dispositivo portatile.
+
+Tenere premuto sul nome di un processo per vedere ulteriori informazioni, o per inviargli un segnale.</translation>
     </message>
     <message>
-        <source>SCSI Hard Disk</source>
-        <translation>Hard Disk SCSI</translation>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <translation>Selezionare qui un segnale e premere il pulsante Invia sulla destra per inviarlo al processo.</translation>
     </message>
     <message>
-        <source>Int. Storage</source>
-        <translation>Storage Interno</translation>
+        <source>Send</source>
+        <translation>Invia</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected signal to this process.</source>
+        <translation>Premere qui per inviare il segnale selezionato a questo processo.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this process.</source>
+        <translation>Quest&apos;area mostra informazioni dettagliate su questo processo.</translation>
+    </message>
+    <message>
+        <source>You really want to send
+</source>
+        <translation type="obsolete">Vuoi veramente inviare
+</translation>
+    </message>
+    <message>
+        <source>You really want to send %1 to this process?</source>
+        <translation>Inviare veramente %1 a questo processo?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Storage</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processi</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilato da: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Built on: </source>
-        <translation>Compilato il:</translation>
+        <translation>Compilato il: </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Version: </source>
+        <translation>&lt;p&gt;Versione: </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Model: </source>
+        <translation>&lt;p&gt;Modello: </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Vendor: </source>
+        <translation>&lt;p&gt;Produttore: </translation>
+    </message>
+    <message>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <translation>Questa pagina mostra le versioni correnti di Opie, del kernel di Linux e della distribuzione in esecuzione su questo dispositivo portatile.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/systemtime.ts b/i18n/it/systemtime.ts
index 2970a32..9f4ebda 100644
--- a/i18n/it/systemtime.ts
+++ b/i18n/it/systemtime.ts
@@ -1,329 +1,245 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished">Formato tempo</translation>
+        <translation>Formato orario</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished">hh:mm</translation>
+        <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M hh:mm</translation>
+        <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished">M/D hh:mm</translation>
+        <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished">12/24 ore</translation>
+        <translation>12/24 ore</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished">24 ore</translation>
+        <translation>24 ore</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished">12 ore</translation>
+        <translation>12 ore</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished">Formato Data</translation>
+        <translation>Formato data</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished">Settimane iniziano il</translation>
+        <translation>Settimane iniziano il</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished">Domenica</translation>
+        <translation>Domenica</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished">Lunedì</translation>
+        <translation>Lunedì</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Orario di Sistema</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Orario</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Prevedi</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Continui?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>In esecuzione:
+ntpdate </translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore nell&apos;ottenimento dell&apos;orario dalla rete.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <translation>Errore nell&apos;esecuzione di ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Time Server</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Errore nell&apos;ottenimento dell&apos;orario dal
+ server: </translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <source>Could not connect to server </source>
+        <translation>Impossibile connetersi al server </translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Hai impostato un ritardo di %1 minuti, ma sono passati solo %2 minutes dall&apos;ultima ricerca.&lt;br&gt;Continuare?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 secondi</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ora inizio</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/d</translation>
     </message>
     <message>
         <source>Time shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Spostamento Orario</translation>
     </message>
     <message>
         <source>New time</source>
-        <translation type="unfinished"></translation>
+        <translation>Nuovo orario</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Ottieni l&apos;orario dalla rete</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Drift orario previsto</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/d</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift stimato</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Orario previsto</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Ultimo [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
+        <translation>Offset [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished"></translation>
+        <translation>Prevedi orario</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Imposta orario previsto</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <translation> s/h</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Set System Time</source>
-        <translation type="obsolete">Imposta Orario di Sistema</translation>
-    </message>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Fuso Orario</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Formato tempo</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 ore</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 ore</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Settimane iniziano il</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domenica</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lunedì</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato Data</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Formato applet</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Ora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
+        <translation> secondi</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Time server</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuti tra gli aggiornamenti dell&apos;orario</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuti tra gli aggiornamenti delle previsioni</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra informazioni time server</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra informazioni orario previsto</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished">Ora</translation>
+        <translation>Ora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">Minuto</translation>
+        <translation>Minuti</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished">AM</translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished">PM</translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuso orario</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Prendi orario da rete</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Imposta orario previsto</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/tetrix.ts b/i18n/it/tetrix.ts
index 43cf13f..319f951 100644
--- a/i18n/it/tetrix.ts
+++ b/i18n/it/tetrix.ts
@@ -1,29 +1,64 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>vuoto</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Inserisci il tuo nome!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Punteggi</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Punti</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Livello</translation>
+    </message>
+</context>
 <context>
     <name>QTetrix</name>
     <message>
         <source>Next</source>
         <translation>Successivo</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation>Punteggio</translation>
+        <translation>Punti</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Livello</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Cancellate</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/textedit.ts b/i18n/it/textedit.ts
index 99c92ad..cf79811 100644
--- a/i18n/it/textedit.ts
+++ b/i18n/it/textedit.ts
@@ -1,246 +1,278 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation>Modifica Testo</translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation>Errore in Scrittura</translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation>Senza Nome</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation>Editor di Testi</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>Tutti</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>Testo</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation>Permessi</translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation>Scegli font</translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Vuoi veramente&lt;BR&gt; &lt;B&gt;cancellare&lt;/B&gt; il file corrente
-dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>No</translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation>Text Edit è copyright&lt;BR&gt;2000 Trolltech AS, e&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;ed è sotto licenza GPL</translation>
-    </message>
-</context>
-<context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salva Come</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Taglia</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>Inserisci Data ed Ora</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Trova...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Zoom +</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Zoom -</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>Configurazione Avanzata</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>A capo automatico</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Inizia con un nuovo file</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Chiedi conferma in Uscita</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>Apri sempre file linkati</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>Permessi File</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>Informazioni</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Trova Successivo</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Chiudi Trova</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Testo</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor di Testi</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>File .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Documento Linkato</translation>
     </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation>Vai alla Linea...</translation>
+    </message>
+    <message>
+        <source>Search Bar Open</source>
+        <translation>Apri Barra di Ricerca</translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation>Salvataggio Automatico 5 min.</translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation>Text Editor ha rivelato&lt;BR&gt;che hai selezionato un file &lt;B&gt;.desktop&lt;/B&gt;.&lt;BR&gt;Aprire il file &lt;B&gt;.desktop&lt;/B&gt; o il file &lt;B&gt;linkato&lt;/B&gt;?</translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation>Modifica Testo</translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation>Errore in Scrittura</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation>Senza Nome</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Permessi</translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation>Scegli font</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
+        <translation type="obsolete">Vuoi veramente&lt;BR&gt; &lt;B&gt;cancellare&lt;/B&gt; il file corrente
+dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation>Text Edit è copyright&lt;BR&gt;2000 Trolltech AS, e&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;ed è sotto licenza GPL</translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation>Textedit</translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation>Sono state rivelate
+modifiche non salvate
+Procedere e salvare?</translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Non Salvare</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancella</translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation>Linee insufficienti</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Text Editor</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Vuoi veramente&lt;BR&gt;&lt;B&gt;cancellare&lt;/B&gt; il file corrente
+dal disco?&lt;BR&gt;L&apos;operazione è &lt;B&gt;irreversibile!&lt;/B&gt;</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation>Permessi File</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Modifica Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Modifica Permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>prprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>altri</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Proprietario</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>lettura</translation>
     </message>
     <message>
         <source>write</source>
         <translation>scrittura</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esecuzione</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Attenzione</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Errore - nessun utente</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Errore - nessun gruppo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Errore nell&apos;impostare il gruppo o il proprietario</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Errore nell&apos;impostare i permessi</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/tictac.ts b/i18n/it/tictac.ts
new file mode 100644
index 0000000..573ba68
--- a/dev/null
+++ b/i18n/it/tictac.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>TicTac</translation>
+    </message>
+</context>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation>Inizia computer</translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation>Inizia umano</translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation>Gioca!</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Esci</translation>
+    </message>
+    <message>
+        <source>Click Play to start</source>
+        <translation>Premere Gioca per iniziare</translation>
+    </message>
+    <message>
+        <source>Make your move</source>
+        <translation>Fai la tua mossa</translation>
+    </message>
+    <message>
+        <source>You won!</source>
+        <translation>Hai vinto!</translation>
+    </message>
+    <message>
+        <source>Computer won!</source>
+        <translation>Il Computer ha vinto!</translation>
+    </message>
+    <message>
+        <source>It&apos;s a draw</source>
+        <translation>Pareggio</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/tinykate.ts b/i18n/it/tinykate.ts
new file mode 100644
index 0000000..21d9df1
--- a/dev/null
+++ b/i18n/it/tinykate.ts
@@ -0,0 +1,62 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKATE</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuovo</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Apri</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Salva Come</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>File</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Font +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Font -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Mostra</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Utilità</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Evidenziato</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Senza nome %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index a213fde..0602b3f 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -1,120 +1,187 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Proprietà di</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Inserisci i tuoi dati personali</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nessun plugin trovato</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nessun plugin attivato</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
-        <translation>Clicca qui per lanciare l&apos;app. associata</translation>
+        <translation>Premi qui per lanciare l&apos;app. associata</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Oggi by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
-        <translation>Clicca qui per andare alle impostazioni</translation>
+        <translation>Premi qui per andare alle impostazioni</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>Configurazione</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>Carica i plugin nell&apos;ordine:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Muovi Giù</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>attivo/ordine</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>avvio automatico al(new line)
+        <translation type="obsolete">avvio automatico al(new line)
 resume?(new line)
 (solo Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>minuti inattivi</translation>
+        <translation type="obsolete">minuti inattivi</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>Clicca qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
+        <translation type="obsolete">Premi qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Quanti minuti il PDA deve rimanere spento prima che entri in funzione l&apos;autostart</translation>
+        <translation type="obsolete">Quanti minuti il PDA deve rimanere spento prima che entri in funzione l&apos;autostart</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>Dimensioni Icona</translation>
+        <translation type="obsolete">Dimensioni Icona</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>Imposta la dimensione dell&apos;icona in pixel</translation>
+        <translation type="obsolete">Imposta la dimensione dell&apos;icona in pixel</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>Aggiorna</translation>
+        <translation type="obsolete">Aggiorna</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Quanto spesso Oggi deve aggiornarsi</translation>
+        <translation type="obsolete">Quanto spesso Oggi deve aggiornarsi</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="obsolete"> sec</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="obsolete">mai</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <translation>Premi per attivare/disattivare un plugin o utilizza le frecce a destra per cambiare l&apos;ordine di visualizzazione</translation>
+    </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Configurazione</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Banner Piccolo</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>Form1</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Premi qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>autostart al riavvio?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>banner piccolo</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Imposta banner piccolo</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation> min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Quanti minuti il PDA deve rimanere spento prima che entri in funzione la funzione autostart al riavvio</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>minuti inattivi</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation> pixel</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Imposta la dimensione dell&apos;icona in pixel</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>dimensione icona</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>mai</translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation>Clicca per attivare/disattivare un plugin o utilizza le frecce a destra per cambiare l&apos;ordine di visualizzazione</translation>
+        <source>How often should Today refresh itself</source>
+        <translation>Quanto spesso Oggi deve aggiornarsi</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>aggiorna</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/todolist.ts b/i18n/it/todolist.ts
index 4b52cf8..92bd327 100644
--- a/i18n/it/todolist.ts
+++ b/i18n/it/todolist.ts
@@ -1,423 +1,611 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Allarme alle %1&lt;/h1&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Task Editor</source>
+        <translation>Editor Attività</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation>Informazioni</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Stato</translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation>Allarmi</translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation>Ricorrenze</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Attività Opie</translation>
+    </message>
+    <message>
+        <source>Enter Task</source>
+        <translation>Inserisci Attività</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Modifica Attività</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation>silenzioso</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>alto</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation>Nuova da modello</translation>
+    </message>
+    <message>
         <source>New Task</source>
-        <translation>Nuovo</translation>
+        <translation>Nuova Attività</translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation>Premi qui per creare una nuova attività.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Modifica</translation>
+        <translation>Modifica Attività</translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation>Premi qui per modificare l&apos;attività corrente.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Visualizza</translation>
+        <translation>Visualizza Attività</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Cancella...</translation>
+        <translation>Elimina...</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation>Premi qui per eliminare l&apos;attività corrente.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Cancella tutti...</translation>
+        <translation>Elimina tutti...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>Cancellazione completata</translation>
+        <translation>Eliminazione completata</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Trasmetti via IrDA</translation>
+        <translation>Trasmetti</translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation>Premi qui per inviare l&apos;attività in corso ad un altro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation>Impegni completati</translation>
+        <source>Show completed tasks</source>
+        <translation>Mostra attività completate</translation>
     </message>
     <message>
-        <source>Show Deadline</source>
-        <translation>Mostra Scadenza</translation>
+        <source>Show only over-due tasks</source>
+        <translation>Mostra solo attività scadute</translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation>Mostra scadenze attività</translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation>Mostra quick task bar</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dati</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <source>Show over due</source>
-        <translation>Mostra da fare</translation>
+        <source>QuickEdit</source>
+        <translation>Modifica veloce</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Mostra</translation>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation>Questa è una lista di tutte le attività in corso.
+
+Vengono elencate le seguenti informazioni:
+1. Completata - un segno verde indica che l&apos;attività è stata completata.  Premi qui per completare un&apos;attività.
+2. Priorità - una rappresentazione grafica della priorità dell&apos;attività.  Premi qui due volte per modificarla.
+3. Descrizione - descrizione dell&apos;attività.  Premi qui per selezionare l&apos;attività.
+4. Scadenza - mostra la scadenza dell&apos;attività.  Questa colonna può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra scadenze attività&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>Nuovo da modello</translation>
+        <source>All Categories</source>
+        <translation>Tutte le Categorie</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation>Tutte</translation>
+        <source>Unfiled</source>
+        <translation>Vuota</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Impossibile salvare le modifiche.
-Liberare dello spazio e
-ritentare.
+Liberare dello spazio e ritentare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation>Impegni</translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
+        <translation>Attività</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation>tutti gli impegni?</translation>
+        <translation>tutte le attività?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation>tutti gli impegni completati?</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation>Vuota</translation>
+        <translation>tutte le attività completate?</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 nuovi impegni inseriti.&lt;p&gt;Vuoi aggiungerli nella tua Todolist?</translation>
+        <translation>&lt;P&gt;%1 nuove attività ricevute.&lt;p&gt;Vuoi aggiungerle alle tue Attività?</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation>Nuovi Impegni</translation>
+        <translation>Nuove Attività</translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialog</name>
     <message>
-        <source>Todo List</source>
-        <translation>Impegni</translation>
+        <source>C.</source>
+        <translation>C.</translation>
     </message>
-</context>
-<context>
-    <name>NewTaskDialogBase</name>
     <message>
-        <source>New Task</source>
-        <translation>Nuovo</translation>
+        <source>Priority</source>
+        <translation>Priorità</translation>
     </message>
     <message>
-        <source>Summary:</source>
-        <translation>Sintesi:</translation>
+        <source>Description</source>
+        <translation>Descrizione</translation>
     </message>
     <message>
-        <source>1 Jan 2001</source>
-        <translation>1 Gen 2001</translation>
+        <source>Deadline</source>
+        <translation>Scadenza</translation>
+    </message>
+    <message>
+        <source>Configure Templates</source>
+        <translation>Modifica Modelli</translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Editor Modelli</translation>
     </message>
     <message>
-        <source>0%</source>
-        <translation>0%</translation>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Modifica</translation>
     </message>
     <message>
-        <source>20%</source>
-        <translation>20%</translation>
+        <source>Remove</source>
+        <translation>Elimina</translation>
     </message>
     <message>
-        <source>40%</source>
-        <translation>40%</translation>
+        <source>Name</source>
+        <translation>Nome</translation>
     </message>
     <message>
-        <source>60%</source>
-        <translation>60%</translation>
+        <source>New Template %1</source>
+        <translation>Nuovo Modello %1</translation>
     </message>
     <message>
-        <source>80%</source>
-        <translation>80%</translation>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Premi qui per impostare la priorità della nuova attività.
+    
+Quest&apos;area è chiamata &quot;quick task bar&quot;.
+
+Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>100%</source>
-        <translation>100%</translation>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Inserisci qui la descrizione della nuova attività.
+
+Quest&apos;area è chiamata &quot;quick task bar&quot;.
+
+Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>&amp;Completed</source>
-        <translation>&amp;Completato</translation>
+        <source>More</source>
+        <translation>Ancora</translation>
     </message>
     <message>
-        <source>1 - Very High</source>
-        <translation>1 - Molto Alta</translation>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Premi qui per inserire altre informazioni per la nuova attività.
+
+Quest&apos;area è chiamata &quot;quick task bar&quot;.
+
+Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>2 - High</source>
-        <translation>2 - Alta</translation>
+        <source>Enter</source>
+        <translation>Inserisci</translation>
     </message>
     <message>
-        <source>3 - Normal</source>
-        <translation>3 - Normale</translation>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Premi qui per aggiungere una nuova attività.
+
+Quest&apos;area è chiamata &quot;quick task bar&quot;.
+
+Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>4 - Low</source>
-        <translation>4 - Bassa</translation>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
-        <translation>5 - Molto Bassa</translation>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Premi qui per cancellare le informazioni sulla nuova attività.
+
+Quest&apos;area è chiamata &quot;quick task bar&quot;.
+
+Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
-        <source>Progress:</source>
-        <translation>Stato:</translation>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
     <message>
-        <source>D&amp;ue</source>
-        <translation>E&amp;ntro:</translation>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
+</context>
+<context>
+    <name>TableView</name>
     <message>
-        <source>Category:</source>
-        <translation>Categoria:</translation>
+        <source>Table View</source>
+        <translation>Mostra Tabella</translation>
     </message>
     <message>
-        <source>Select</source>
-        <translation>Seleziona</translation>
+        <source>%1 day(s)</source>
+        <translation>%1 giorno(i)</translation>
     </message>
     <message>
-        <source>Group:</source>
-        <translation>Gruppo:</translation>
+        <source>None</source>
+        <translation>Nessuna</translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>Edit Task</source>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Ora</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nuova</translation>
+    </message>
+    <message>
+        <source>Edit</source>
         <translation>Modifica</translation>
     </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
 </context>
 <context>
-    <name>TableView</name>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>C.</source>
-        <translation>C.</translation>
+        <source>Summary:</source>
+        <translation>Sommario:</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>Prior.</translation>
+        <source>Enter brief description of the task here.</source>
+        <translation>Inserisci qui una breve descrizione dell&apos;attività.</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation>Descrizione</translation>
+        <source>Complete </source>
+        <translation>Completare </translation>
     </message>
     <message>
-        <source>Deadline</source>
-        <translation>Scadenza</translation>
+        <source>Work on </source>
+        <translation>Lavorare su </translation>
     </message>
     <message>
-        <source>Table View</source>
-        <translation>Mostra Tabella</translation>
+        <source>Buy </source>
+        <translation>Comprare </translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Nessuna</translation>
+        <source>Organize </source>
+        <translation>Organizzare </translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
     <message>
-        <source>Template Editor</source>
-        <translation>Modifica Modelli</translation>
+        <source>Get </source>
+        <translation>Prendere </translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation>Aggiungi</translation>
+        <source>Update </source>
+        <translation>Aggiornare </translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation>Modifica</translation>
+        <source>Create </source>
+        <translation>Creare </translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>Elimina</translation>
+        <source>Plan </source>
+        <translation>Pianificare </translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
-        <translation>Nome</translation>
+        <source>Call </source>
+        <translation>Chiamare </translation>
     </message>
     <message>
-        <source>New Template %1</source>
-        <translation>Nuovo Modello %1</translation>
+        <source>Mail </source>
+        <translation>Inviare per posta </translation>
     </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
-        <translation>Modifica Modello</translation>
+        <source>Select priority of task here.</source>
+        <translation>Seleziona qui la priorità dell&apos;attivita.</translation>
     </message>
-</context>
-<context>
-    <name>TodoTable</name>
     <message>
-        <source>C.</source>
-        <translation type="obsolete">C.</translation>
+        <source>Very High</source>
+        <translation>Molto Alta</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation type="obsolete">Prior.</translation>
+        <source>High</source>
+        <translation>Alta</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descrizione</translation>
+        <source>Normal</source>
+        <translation>Normale</translation>
     </message>
     <message>
-        <source>Deadline</source>
-        <translation type="obsolete">Scadenza</translation>
+        <source>Low</source>
+        <translation>Bassa</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Vuota</translation>
+        <source>Very Low</source>
+        <translation>Molto Bassa</translation>
     </message>
     <message>
-        <source>All</source>
-        <translation type="obsolete">Tutte</translation>
+        <source>Category:</source>
+        <translation>Categoria:</translation>
+    </message>
+    <message>
+        <source>Select category to organize this task with.</source>
+        <translation>Seleziona la categoria in cui deve essere inserita quest&apos;attività.</translation>
+    </message>
+    <message>
+        <source>Recurring task</source>
+        <translation>Attività ricorrente</translation>
+    </message>
+    <message>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation>Premi qui se l&apos;attività è eseguita in modo ricorrente. Se selezionato, la frequenza può essere impostata nel tab Ricorrenza.</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation>Descrizione:</translation>
+    </message>
+    <message>
+        <source>Enter any additional information about this task here.</source>
+        <translation>Inserisci qui ogni altra informazione aggiuntiva per questa attività.</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Attività</translation>
     </message>
 </context>
 <context>
-    <name>TodoWindow</name>
+    <name>TaskEditorStatus</name>
     <message>
-        <source>Todo</source>
-        <translation type="obsolete">Impegni</translation>
+        <source>Status:</source>
+        <translation>Stato:</translation>
     </message>
     <message>
-        <source>Out of Space</source>
-        <translation type="obsolete">Spazio Esaurito</translation>
+        <source>Click here to set the current status of this task.</source>
+        <translation>Premi qui per inserire lo stato di questa attività.</translation>
     </message>
     <message>
-        <source>Unable to create startup files
-Free up some space
-before you enter any data</source>
-        <translation type="obsolete">Impossibile creare file di avvio
-Liberare dello spazio prima
-di inserire i dati</translation>
+        <source>Started</source>
+        <translation>Iniziata</translation>
     </message>
     <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nuovo</translation>
+        <source>Postponed</source>
+        <translation>Rinviata</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Modifica</translation>
+        <source>Finished</source>
+        <translation>Terminata</translation>
     </message>
     <message>
-        <source>View Task</source>
-        <translation type="obsolete">Visualizza</translation>
+        <source>Not started</source>
+        <translation>Non iniziata</translation>
     </message>
     <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Cancella...</translation>
+        <source>Progress:</source>
+        <translation>Avanzamento:</translation>
     </message>
     <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Cancella tutti...</translation>
+        <source>Select progress made on this task here.</source>
+        <translation>Seleziona qui lo stato di avanzamento per questa attività.</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Copia</translation>
+        <source>0 %</source>
+        <translation>0 %</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Trasmetti via IrDA</translation>
+        <source>20 %</source>
+        <translation>20 %</translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="obsolete">Trova</translation>
+        <source>40 %</source>
+        <translation>40 %</translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation type="obsolete">Impegni completati</translation>
+        <source>60 %</source>
+        <translation>60 %</translation>
     </message>
     <message>
-        <source>Show Deadline</source>
-        <translation type="obsolete">Mostra scadenza</translation>
+        <source>80 %</source>
+        <translation>80 %</translation>
     </message>
     <message>
-        <source>Fonts</source>
-        <translation type="obsolete">Font</translation>
+        <source>100 %</source>
+        <translation>100 %</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dati</translation>
+        <source>Start Date:</source>
+        <translation>Data Inizio:</translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoria</translation>
+        <source>Click here to set the date this task was started.</source>
+        <translation>Premi qui per inserire la data in cui l&apos;attività è iniziata.</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Opzioni</translation>
+        <source>Due Date:</source>
+        <translation>Data Fine:</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="obsolete">Impossibile modificare i dati, sincronizzazione in corso</translation>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation>Premi qui per inserire la data entro cui l&apos;attività deve essere completata.</translation>
     </message>
     <message>
-        <source>all tasks</source>
-        <translation type="obsolete">tutti gli impegni</translation>
+        <source>Completed:</source>
+        <translation>Completata:</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Tutte</translation>
+        <source>Click here to mark this task as completed.</source>
+        <translation>Premi qui per contrassegnare l&apos;attività come completata.</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Vuota</translation>
+        <source>Click here to set the date this task was completed.</source>
+        <translation>Premi qui per inserire la data in cui quest&apos;attività è stata completata.</translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="obsolete">Spazio esaurito</translation>
+        <source>Maintainer Mode:</source>
+        <translation>Modalità Responsabile:</translation>
     </message>
     <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="obsolete">Impossibile salvare le modifiche.
-Liberare dello spazio e
-ritentare.
-
-Uscire comunque?</translation>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation>Premi qui per inserire la funzione del responsabile.</translation>
+    </message>
+    <message>
+        <source>Nothing</source>
+        <translation>Nessuna</translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation>Responsabile</translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation>Eseguito Da</translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation>Coordinato</translation>
+    </message>
+    <message>
+        <source>Maintainer:</source>
+        <translation>Responsabile:</translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation>Questo è il nome del responsabile dell&apos;attività corrente.</translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation>test</translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation>Premi qui per selezionare il responsabile dell&apos;attività.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/ubrowser.ts b/i18n/it/ubrowser.ts
new file mode 100644
index 0000000..045745a
--- a/dev/null
+++ b/i18n/it/ubrowser.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation> - uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - uBrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>Errore!</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>Indirizzo IP non trovato</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Errore nella creazione del socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Errore nella connessione al socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/usermanager.ts b/i18n/it/usermanager.ts
index 713087b..66f7524 100644
--- a/i18n/it/usermanager.ts
+++ b/i18n/it/usermanager.ts
@@ -1,32 +1,36 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Aggiungi Gruppo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Modifica Gruppo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>OPIE Gestione Utente</translation>
+        <translation type="obsolete">OPIE Gestione Utente</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Gestione Utenti Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Aggiungi Utente</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Modifica Utente</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/wellenreiter.ts b/i18n/it/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/it/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/it/wlansetup.ts b/i18n/it/wlansetup.ts
deleted file mode 100644
index eeb125a..0000000
--- a/i18n/it/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation>Impostazioni LAN Wireless</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation>Configurazione</translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation>ESS ID</translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation>ESSID Non-Spec: &quot;TUTTI&quot;</translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation>ESSID Specifico</translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation>Tipo Rete</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation>Infrastruttura</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Canale</translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation>802.11 Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation>Wep</translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation>Impostazioni Chiave</translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation>Chiave 1</translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation>Chiave 2</translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation>Chiave 3</translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation>Chiave 4</translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation>Lunghezza Chiave</translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation>40 Bit</translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation>128 Bit</translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation>Tipo Autenticazione</translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation>Sistema Aperto</translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation>Chiave Condivisa</translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation>Abilita Wep</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/it/wordgame.ts b/i18n/it/wordgame.ts
new file mode 100644
index 0000000..06141f6
--- a/dev/null
+++ b/i18n/it/wordgame.ts
@@ -0,0 +1,134 @@
+<!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>Board</name>
+    <message>
+        <source>Blanks: </source>
+        <translation>Vuoti: </translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <source>Unknown word</source>
+        <translation>Parola sconosciuta</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
+        <translation>&lt;p&gt;La parola &quot;%1&quot; non è presente nel dizionario.</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Ignora</translation>
+    </message>
+</context>
+<context>
+    <name>NewGameBase</name>
+    <message>
+        <source>Players</source>
+        <translation>Giocatori</translation>
+    </message>
+    <message>
+        <source>AI3: Smart AI player</source>
+        <translation>IA3: IA Avanzata</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regole</translation>
+    </message>
+    <message>
+        <source>&amp;Start</source>
+        <translation>&amp;Inizio</translation>
+    </message>
+</context>
+<context>
+    <name>RulesBase</name>
+    <message>
+        <source>Game Rules</source>
+        <translation>Regole Gioco</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Nome:</translation>
+    </message>
+    <message>
+        <source>Board</source>
+        <translation>Board</translation>
+    </message>
+    <message>
+        <source>Size:</source>
+        <translation>Dimensione:</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation>Modifica...</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancella</translation>
+    </message>
+</context>
+<context>
+    <name>ScoreInfo</name>
+    <message>
+        <source>&lt;P&gt;Invalid move</source>
+        <translation>&lt;P&gt;Mossa non valida</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Score: </source>
+        <translation>&lt;P&gt;Punti: </translation>
+    </message>
+</context>
+<context>
+    <name>WordGame</name>
+    <message>
+        <source>Word Game</source>
+        <translation>Word Game</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Indietro</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Fatto</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Chiudi</translation>
+    </message>
+    <message>
+        <source>End game</source>
+        <translation>Fine partita</translation>
+    </message>
+    <message>
+        <source>Do you want to end the game early?</source>
+        <translation>Vuoi terminare la partita prematuramente?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sì</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>No</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/ja/aqpkg.ts b/i18n/ja/aqpkg.ts
deleted file mode 100644
index 348cc10..0000000
--- a/i18n/ja/aqpkg.ts
+++ b/dev/null
@@ -1,546 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CategoryFilterImpl</name>
-    <message>
-        <source>Category Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DataManager</name>
-    <message>
-        <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputDialog</name>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space Avail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-**** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Errors only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Informative messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set filter category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all packages for the server feed selected above.
-
-A blue dot next to the package name indicates that the package is currently installed.
-
-A blue dot with a star indicates that a newer version of the package is available from the server feed.
-
-Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building server list:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building package list for:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WARNING: Upgrading while
-Opie/Qtopia is running
-is NOT recommended!
-
-Are you sure?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to delete
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download to where</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter package location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No packages selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or reinstall
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or upgrade
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-    <message>
-        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsImpl</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
deleted file mode 100644
index 7cc5f42..0000000
--- a/i18n/ja/datebook.ts
+++ b/dev/null
@@ -1,804 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</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>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Views</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default view:</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>Week List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start-End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libqpe.ts b/i18n/ja/libqpe.ts
deleted file mode 100644
index b75236e..0000000
--- a/i18n/ja/libqpe.ts
+++ b/dev/null
@@ -1,886 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodayaddressbookplugin.ts b/i18n/ja/libtodayaddressbookplugin.ts
deleted file mode 100644
index 2f40ece..0000000
--- a/i18n/ja/libtodayaddressbookplugin.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddressBookPluginConfig</name>
-    <message>
-        <source>Max Lines: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Days look ahead: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many days we should search forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Headline Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors for the headlines !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Entry Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This color will be used for shown birthdays/anniversaries !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Urgent
-Color if below </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> days: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This urgent color will be used if we are close to the event !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodaydatebookplugin.ts b/i18n/ja/libtodaydatebookplugin.ts
deleted file mode 100644
index e392d58..0000000
--- a/i18n/ja/libtodaydatebookplugin.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodayfortuneplugin.ts b/i18n/ja/libtodayfortuneplugin.ts
deleted file mode 100644
index 931718a..0000000
--- a/i18n/ja/libtodayfortuneplugin.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Fortune plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodaymailplugin.ts b/i18n/ja/libtodaymailplugin.ts
deleted file mode 100644
index a7b6519..0000000
--- a/i18n/ja/libtodaymailplugin.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Mail plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodaystocktickerplugin.ts b/i18n/ja/libtodaystocktickerplugin.ts
deleted file mode 100644
index 0693d23..0000000
--- a/i18n/ja/libtodaystocktickerplugin.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>StockTicker plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StockTickerPluginWidget</name>
-    <message>
-        <source>Connection refused.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Socket read error.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StocktickerPluginConfig</name>
-    <message>
-        <source>Enter stock symbols seperated
-by a space.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Time of current price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles date field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Symbol field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Name of symbols owner field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles current Price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles last price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles opening price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles minimum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles maximum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles daily variation of price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles volume of trading field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often stocks prices should be looked up. In minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minutes between lookups.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed of scrolling action, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Speed, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Length of scrolling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodaytodolistplugin.ts b/i18n/ja/libtodaytodolistplugin.ts
deleted file mode 100644
index 5ca01fe..0000000
--- a/i18n/ja/libtodaytodolistplugin.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Todolist plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/libtodayweatherplugin.ts b/i18n/ja/libtodayweatherplugin.ts
deleted file mode 100644
index 8f245b0..0000000
--- a/i18n/ja/libtodayweatherplugin.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Weather plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginConfig</name>
-    <message>
-        <source>Enter ICAO location identifier:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use metric units</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select type of units displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update frequency (in minutes):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select how often (in minutes) you want the weather to be updated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginWidget</name>
-    <message>
-        <source>Retreiving current weather information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Temp: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  Wind: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Pres: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current weather data not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>N </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> KPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> MPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> hPa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Hg</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/mailit.ts b/i18n/ja/mailit.ts
deleted file mode 100644
index d61ee1d..0000000
--- a/i18n/ja/mailit.ts
+++ b/dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddAtt</name>
-    <message>
-        <source>Attached</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>attach...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditAccount</name>
-    <message>
-        <source>Edit Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create new Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailClient</name>
-    <message>
-        <source>Idle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must create an account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>getMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>select account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to download mail via all available accounts.
- Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account associated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is no active account 
-associated to this mail
- it can not be downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailHandler</name>
-    <message>
-        <source>Could not locate all files in 
-mail with subject: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailItWindow</name>
-    <message>
-        <source>Write mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Central view area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail you have clicked 
-has not been downloaded yet.
- Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PopClient</name>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error Occured</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Retrieving </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completing message </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new Messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the inbox view.
-It keeps the fetched mail which can be 
-viewed by double clicking the entry.
-blue attachment icon shows whether this 
-mailhas attachments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the outbox view.
-It keeps the queued mails to send which can be 
-reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ReadMail</name>
-    <message>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attatchments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail view has 2 modes:
-&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply to mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail
-Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SmtpClient</name>
-    <message>
-        <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sent </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewAtt</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WriteMail</name>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enque mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No recipient</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> starts======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FWD: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======end of forwarded message======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> wrote on </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/opie-write.ts b/i18n/ja/opie-write.ts
deleted file mode 100644
index be81c52..0000000
--- a/i18n/ja/opie-write.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QTextEdit</name>
-    <message>
-        <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/opieplayer2.ts b/i18n/ja/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/ja/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/reader.ts b/i18n/ja/reader.ts
deleted file mode 100644
index 3842246..0000000
--- a/i18n/ja/reader.ts
+++ b/dev/null
@@ -1,308 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTReaderApp</name>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On Action...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Overlap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Target</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continuous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Markup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peanut/PML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strip CR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dehyphen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Single Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unindent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-paragraph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Double Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repalm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Embolden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ideogram/Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascii</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UTF-8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UCS-2(BE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USC-2(LE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows(1252)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Marks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Reg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>fileBrowser</name>
-    <message>
-        <source>Browse for file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ja/wellenreiter.ts b/i18n/ja/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/ja/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/ko/.cvsignore b/i18n/ko/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/ko/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/ko/aqpkg.ts b/i18n/ko/aqpkg.ts
deleted file mode 100644
index 348cc10..0000000
--- a/i18n/ko/aqpkg.ts
+++ b/dev/null
@@ -1,546 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CategoryFilterImpl</name>
-    <message>
-        <source>Category Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DataManager</name>
-    <message>
-        <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputDialog</name>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space Avail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-**** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Errors only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Informative messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set filter category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all packages for the server feed selected above.
-
-A blue dot next to the package name indicates that the package is currently installed.
-
-A blue dot with a star indicates that a newer version of the package is available from the server feed.
-
-Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building server list:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building package list for:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WARNING: Upgrading while
-Opie/Qtopia is running
-is NOT recommended!
-
-Are you sure?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to delete
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download to where</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter package location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No packages selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or reinstall
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or upgrade
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-    <message>
-        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsImpl</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
deleted file mode 100644
index 7cc5f42..0000000
--- a/i18n/ko/datebook.ts
+++ b/dev/null
@@ -1,804 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</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>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Views</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default view:</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>Week List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start-End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libqpe.ts b/i18n/ko/libqpe.ts
deleted file mode 100644
index b75236e..0000000
--- a/i18n/ko/libqpe.ts
+++ b/dev/null
@@ -1,886 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodayaddressbookplugin.ts b/i18n/ko/libtodayaddressbookplugin.ts
deleted file mode 100644
index 2f40ece..0000000
--- a/i18n/ko/libtodayaddressbookplugin.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddressBookPluginConfig</name>
-    <message>
-        <source>Max Lines: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Days look ahead: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many days we should search forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Headline Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors for the headlines !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Entry Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This color will be used for shown birthdays/anniversaries !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Urgent
-Color if below </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> days: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This urgent color will be used if we are close to the event !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodaydatebookplugin.ts b/i18n/ko/libtodaydatebookplugin.ts
deleted file mode 100644
index e392d58..0000000
--- a/i18n/ko/libtodaydatebookplugin.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodayfortuneplugin.ts b/i18n/ko/libtodayfortuneplugin.ts
deleted file mode 100644
index 931718a..0000000
--- a/i18n/ko/libtodayfortuneplugin.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Fortune plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodaymailplugin.ts b/i18n/ko/libtodaymailplugin.ts
deleted file mode 100644
index a7b6519..0000000
--- a/i18n/ko/libtodaymailplugin.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Mail plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodaystocktickerplugin.ts b/i18n/ko/libtodaystocktickerplugin.ts
deleted file mode 100644
index 0693d23..0000000
--- a/i18n/ko/libtodaystocktickerplugin.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>StockTicker plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StockTickerPluginWidget</name>
-    <message>
-        <source>Connection refused.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Socket read error.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StocktickerPluginConfig</name>
-    <message>
-        <source>Enter stock symbols seperated
-by a space.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Time of current price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles date field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Symbol field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Name of symbols owner field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles current Price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles last price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles opening price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles minimum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles maximum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles daily variation of price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles volume of trading field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often stocks prices should be looked up. In minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minutes between lookups.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed of scrolling action, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Speed, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Length of scrolling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodaytodolistplugin.ts b/i18n/ko/libtodaytodolistplugin.ts
deleted file mode 100644
index 5ca01fe..0000000
--- a/i18n/ko/libtodaytodolistplugin.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Todolist plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/libtodayweatherplugin.ts b/i18n/ko/libtodayweatherplugin.ts
deleted file mode 100644
index 8f245b0..0000000
--- a/i18n/ko/libtodayweatherplugin.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Weather plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginConfig</name>
-    <message>
-        <source>Enter ICAO location identifier:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use metric units</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select type of units displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update frequency (in minutes):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select how often (in minutes) you want the weather to be updated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginWidget</name>
-    <message>
-        <source>Retreiving current weather information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Temp: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  Wind: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Pres: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current weather data not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>N </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> KPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> MPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> hPa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Hg</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/mailit.ts b/i18n/ko/mailit.ts
deleted file mode 100644
index d61ee1d..0000000
--- a/i18n/ko/mailit.ts
+++ b/dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddAtt</name>
-    <message>
-        <source>Attached</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>attach...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditAccount</name>
-    <message>
-        <source>Edit Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create new Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailClient</name>
-    <message>
-        <source>Idle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must create an account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>getMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>select account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to download mail via all available accounts.
- Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account associated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is no active account 
-associated to this mail
- it can not be downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailHandler</name>
-    <message>
-        <source>Could not locate all files in 
-mail with subject: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailItWindow</name>
-    <message>
-        <source>Write mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Central view area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail you have clicked 
-has not been downloaded yet.
- Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PopClient</name>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error Occured</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Retrieving </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completing message </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new Messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the inbox view.
-It keeps the fetched mail which can be 
-viewed by double clicking the entry.
-blue attachment icon shows whether this 
-mailhas attachments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the outbox view.
-It keeps the queued mails to send which can be 
-reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ReadMail</name>
-    <message>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attatchments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail view has 2 modes:
-&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply to mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail
-Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SmtpClient</name>
-    <message>
-        <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sent </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewAtt</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WriteMail</name>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enque mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No recipient</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> starts======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FWD: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======end of forwarded message======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> wrote on </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/opie-write.ts b/i18n/ko/opie-write.ts
deleted file mode 100644
index be81c52..0000000
--- a/i18n/ko/opie-write.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QTextEdit</name>
-    <message>
-        <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/opieplayer2.ts b/i18n/ko/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/ko/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/reader.ts b/i18n/ko/reader.ts
deleted file mode 100644
index 3842246..0000000
--- a/i18n/ko/reader.ts
+++ b/dev/null
@@ -1,308 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTReaderApp</name>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On Action...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Overlap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Target</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continuous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Markup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peanut/PML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strip CR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dehyphen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Single Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unindent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-paragraph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Double Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repalm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Embolden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ideogram/Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascii</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UTF-8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UCS-2(BE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USC-2(LE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows(1252)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Marks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Reg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>fileBrowser</name>
-    <message>
-        <source>Browse for file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/ko/wellenreiter.ts b/i18n/ko/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/ko/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/ja/.cvsignore b/i18n/mk/.cvsignore
index 8df47d5..8df47d5 100644
--- a/i18n/ja/.cvsignore
+++ b/i18n/mk/.cvsignore
diff --git a/i18n/mk/.directory b/i18n/mk/.directory
index daf4f4e..7691fc8 100644
--- a/i18n/mk/.directory
+++ b/i18n/mk/.directory
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Name=Makedonian
 Name[de]=Mazedonisch
+Name[it]=Macedone
 Name[pt]=Macedoniano
 Name[pt_BR]=Macedoniano
 Name[sl]=Makedonščina
+Name[nl]=Macedonisch
\ No newline at end of file
diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
new file mode 100644
index 0000000..4e659af
--- a/dev/null
+++ b/i18n/mk/addressbook.ts
@@ -0,0 +1,1514 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AbTable</name>
+    <message>
+        <source>Full Name</source>
+        <translation>Име и Презиме</translation>
+    </message>
+    <message>
+        <source>Contact</source>
+        <translation>Контакт</translation>
+    </message>
+    <message>
+        <source>Pick</source>
+        <translation>Избор</translation>
+    </message>
+</context>
+<context>
+    <name>AddressbookWindow</name>
+    <message>
+        <source>Contacts</source>
+        <translation>Контакти</translation>
+    </message>
+    <message>
+        <source>Contact</source>
+        <translation>Контакт</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>List</source>
+        <translation>Листа</translation>
+    </message>
+    <message>
+        <source>Card</source>
+        <translation>Катичка</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Пронајди</translation>
+    </message>
+    <message>
+        <source>Start Search</source>
+        <translation>Започни Пребарување</translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation>Затвори Пребарување</translation>
+    </message>
+    <message>
+        <source>Write Mail To</source>
+        <translation>Напиши е-порака до</translation>
+    </message>
+    <message>
+        <source>Beam Entry</source>
+        <translation>Пренеси запис</translation>
+    </message>
+    <message>
+        <source>Import vCard</source>
+        <translation>Вметни вКаричка</translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation>Извези вКаричка</translation>
+    </message>
+    <message>
+        <source>My Personal Details</source>
+        <translation>Мои лични детали</translation>
+    </message>
+    <message>
+        <source>Save all Data</source>
+        <translation>Сними ги сите податоци</translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation>Треба да изберете контакт!</translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation>Треба да поставите име на даотека !</translation>
+    </message>
+    <message>
+        <source>Right file type ?</source>
+        <translation>Точен тип на датотека ?</translation>
+    </message>
+    <message>
+        <source>The selected file 
+ does not end with &quot;.vcf&quot;.
+ Do you really want to open it?</source>
+        <translation>Избраната датотека
+не завешува со „.vcf“
+Дали сакате да ја отворите?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation>&amp;Да</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation>&amp;Не</translation>
+    </message>
+    <message>
+        <source>Add Contact?</source>
+        <translation>Додади контакт?</translation>
+    </message>
+    <message>
+        <source>Do you really want add contact for 
+%1?</source>
+        <translation>Дали сакате да додадете контакт за
+%1?</translation>
+    </message>
+    <message>
+        <source>&amp;All Yes</source>
+        <translation>&amp;Да за сите</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation>Неможе да се уредуваат податоците, во моментот се синхронизираат</translation>
+    </message>
+    <message>
+        <source>Edit Address</source>
+        <translation>Уреди Адреса</translation>
+    </message>
+    <message>
+        <source>Edit My Personal Details</source>
+        <translation>Ѕреди ги моите лични детали</translation>
+    </message>
+    <message>
+        <source>Contacts - My Personal Details</source>
+        <translation>Контакти -  мои лични детали</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Нема доволно простор</translation>
+    </message>
+    <message>
+        <source>Unable to save information.
+Free up some space
+and try again.
+
+Quit anyway?</source>
+        <translation>Неможе да се сними информацијата.
+Ослободте простор
+и обидете се повторно
+
+Излегување?</translation>
+    </message>
+    <message>
+        <source>Not Found</source>
+        <translation>Не е пронајдено</translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>Не можеше да се пронајде контакт за 
+ова пребарување!</translation>
+    </message>
+    <message>
+        <source>Cards</source>
+        <translation>Катички</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Не е внесено</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDlg_Base</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Click on tab to select one</source>
+        <translation>Кликнете на јазиче за да изберете едно</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Општо</translation>
+    </message>
+    <message>
+        <source>Search Settings</source>
+        <translation>Подесувања за пребарување</translation>
+    </message>
+    <message>
+        <source>Query Style</source>
+        <translation>Стил на прашање</translation>
+    </message>
+    <message>
+        <source>Settings for the search query style</source>
+        <translation>Подесувања за стилот на прашањето на пребарување</translation>
+    </message>
+    <message>
+        <source>Use Regular Expressions</source>
+        <translation>Користи регуларни изрази</translation>
+    </message>
+    <message>
+        <source>Search widget expects regular expressions if selected</source>
+        <translation>Алатката за пребарување очекува регуларен израз доколку се избере</translation>
+    </message>
+    <message>
+        <source>Use Wildcards (*,?)</source>
+        <translation>Користи специјални знаци (*,?)</translation>
+    </message>
+    <message>
+        <source>Search widget just expects simple wildcards</source>
+        <translation>Алатката за пребарување очекува само едноставни специјални знаци</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>Внимавај на Големи и Мали букви</translation>
+    </message>
+    <message>
+        <source>If selected, search differs between upper and lower chars</source>
+        <translation>Доколку е изврано, пребарувањето ги разликува големите и малите букви</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Фонт</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Мал</translation>
+    </message>
+    <message>
+        <source>Font size for list- and card view</source>
+        <translation>Големина на фонт за листа - преглед на картички</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Нормален</translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation>Голем</translation>
+    </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation>Алатки-/Мени палета</translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation>Фиксиран</translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation>Префрли се на фиксирано мени-/палети по рестартирање на апликацијата !</translation>
+    </message>
+    <message>
+        <source>Moveable</source>
+        <translation>Поместиливи</translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation>Префрли се на поместливо мени-/палети по рестартирање на апликацијата !</translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation>Електронска Пошта</translation>
+    </message>
+    <message>
+        <source>Fontsettings for list and card view</source>
+        <translation>Подесувања на фонт за листа и преглед на картички</translation>
+    </message>
+    <message>
+        <source>Prefer QT-Mail </source>
+        <translation>Преферирам QT-Mail</translation>
+    </message>
+    <message>
+        <source>Use Sharp&apos;s mail application if available</source>
+        <translation>Користи ја апликацијата за електронска пошта на Sharp доколку е достапна</translation>
+    </message>
+    <message>
+        <source>Prefer Opie-Mail</source>
+        <translation>Преферирам Opie-Mail</translation>
+    </message>
+    <message>
+        <source>Use OPIE mail if installed</source>
+        <translation>Користи OPIE апликација за електронска пошта ако е инсталирана</translation>
+    </message>
+    <message>
+        <source>Notice: QT-Mail is just 
+provided in the SHARP 
+default ROM. Opie-Mail 
+is provided free !</source>
+        <translation>Забелешка: QT-Mail е 
+достапен само на  
+SHARP основниот ROM.
+Оpie-Mail е слободен !</translation>
+    </message>
+    <message>
+        <source>Order</source>
+        <translation>Подреди</translation>
+    </message>
+    <message>
+        <source>Select Contact Order:</source>
+        <translation>Избери редослед на контакти:</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Нагоре</translation>
+    </message>
+    <message>
+        <source>Move selected attribute one line up</source>
+        <translation>Помести го избраниот атрибут еден ред погоре</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Надоле</translation>
+    </message>
+    <message>
+        <source>Move selected attribute one line down</source>
+        <translation>Помести го избраниот атрибут еден ред подоле</translation>
+    </message>
+    <message>
+        <source>List of all available attributes</source>
+        <translation>Листа на сите достапни атрибути</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Add selected attribute from list below to the upper list</source>
+        <translation>Додај го избраниот атрибут од долната на горната листа</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Отстрани</translation>
+    </message>
+    <message>
+        <source>Remove the selected attribute from the upper list</source>
+        <translation>Отстрани го избраниот атрибут од горната листа</translation>
+    </message>
+    <message>
+        <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
+        <translation>Подреди (горе -&gt; доле) го дефинира примарниот контакт прикажан во втората колона на прегледот по листа </translation>
+    </message>
+</context>
+<context>
+    <name>ContactEditor</name>
+    <message>
+        <source>Full Name...</source>
+        <translation>Полно име...</translation>
+    </message>
+    <message>
+        <source>Press to enter last- middle and firstname</source>
+        <translation>Притиснете enter за да внесете презиме, средно име и име</translation>
+    </message>
+    <message>
+        <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
+        <translation>Внесете го целото име директно! Доколку имате презиме со повеќе зборови (на пр, Јакимовска Јосифовиќ), напишете &lt;презиме&gt;,&lt;име&gt; пр: Јакимовска Јосифовиќ, Слободанка</translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation>Работно Место</translation>
+    </message>
+    <message>
+        <source>The jobtitle..</source>
+        <translation>Работно Место..</translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation>Суфикс</translation>
+    </message>
+    <message>
+        <source>Something like &quot;jr.&quot;..</source>
+        <translation>Нешто како „јр.“..</translation>
+    </message>
+    <message>
+        <source>Organization</source>
+        <translation>Организација</translation>
+    </message>
+    <message>
+        <source>The working place of the contact</source>
+        <translation>Работно место на контактот</translation>
+    </message>
+    <message>
+        <source>Press to select attribute to change</source>
+        <translation>Притисно ма атрибутот кој сакате да го измените</translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation>Зачувај како</translation>
+    </message>
+    <message>
+        <source>Press to select how to store the name (and howto show it in the listview)</source>
+        <translation>Притиснете да изберете како да го зачувате името (и како да го прикажете во прегледот на листата)</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation>Категорија</translation>
+    </message>
+    <message>
+        <source>Notes...</source>
+        <translation>Забелешки...</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Основни</translation>
+    </message>
+    <message>
+        <source>Business</source>
+        <translation>Бизнис</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation>Адреса</translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation>Град</translation>
+    </message>
+    <message>
+        <source>State</source>
+        <translation>Република</translation>
+    </message>
+    <message>
+        <source>Zip Code</source>
+        <translation>Поштенски код</translation>
+    </message>
+    <message>
+        <source>Country</source>
+        <translation>Држава</translation>
+    </message>
+    <message>
+        <source>United States</source>
+        <translation>Соединети Држави</translation>
+    </message>
+    <message>
+        <source>United Kingdom</source>
+        <translation>Велика Британија</translation>
+    </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation>Авганистан</translation>
+    </message>
+    <message>
+        <source>Albania</source>
+        <translation>Албанија</translation>
+    </message>
+    <message>
+        <source>Algeria</source>
+        <translation>Алгерија</translation>
+    </message>
+    <message>
+        <source>American Samoa</source>
+        <translation>Америчка Самоа</translation>
+    </message>
+    <message>
+        <source>Andorra</source>
+        <translation>Андора</translation>
+    </message>
+    <message>
+        <source>Angola</source>
+        <translation>Ангола</translation>
+    </message>
+    <message>
+        <source>Anguilla</source>
+        <translation>Ангулија</translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation>Антартик</translation>
+    </message>
+    <message>
+        <source>Argentina</source>
+        <translation>Аргентина</translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation>Ерменија</translation>
+    </message>
+    <message>
+        <source>Aruba</source>
+        <translation>Аруба</translation>
+    </message>
+    <message>
+        <source>Australia</source>
+        <translation>Аустралија</translation>
+    </message>
+    <message>
+        <source>Austria</source>
+        <translation>Австриа</translation>
+    </message>
+    <message>
+        <source>Azerbaijan</source>
+        <translation>Азејберџан</translation>
+    </message>
+    <message>
+        <source>Bahamas</source>
+        <translation>Бахами</translation>
+    </message>
+    <message>
+        <source>Bahrain</source>
+        <translation>Бахиран</translation>
+    </message>
+    <message>
+        <source>Bangladesh</source>
+        <translation>Бангладеш</translation>
+    </message>
+    <message>
+        <source>Barbados</source>
+        <translation>Барбадос</translation>
+    </message>
+    <message>
+        <source>Belarus</source>
+        <translation>Беларус</translation>
+    </message>
+    <message>
+        <source>Belgium</source>
+        <translation>Белгија</translation>
+    </message>
+    <message>
+        <source>Belize</source>
+        <translation>Белз</translation>
+    </message>
+    <message>
+        <source>Benin</source>
+        <translation>Бенин</translation>
+    </message>
+    <message>
+        <source>Bermuda</source>
+        <translation>Бермуди</translation>
+    </message>
+    <message>
+        <source>Bhutan</source>
+        <translation>Бхутан</translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation>Боливија</translation>
+    </message>
+    <message>
+        <source>Botswana</source>
+        <translation>Боцвана</translation>
+    </message>
+    <message>
+        <source>Bouvet Island</source>
+        <translation>Боветски острови</translation>
+    </message>
+    <message>
+        <source>Brazil</source>
+        <translation>Бразил</translation>
+    </message>
+    <message>
+        <source>Brunei Darussalam</source>
+        <translation>Бурнеи</translation>
+    </message>
+    <message>
+        <source>Bulgaria</source>
+        <translation>Бугарија</translation>
+    </message>
+    <message>
+        <source>Burkina Faso</source>
+        <translation>Буркина</translation>
+    </message>
+    <message>
+        <source>Burundi</source>
+        <translation>Бурунди</translation>
+    </message>
+    <message>
+        <source>Cambodia</source>
+        <translation>Камбоџа</translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation>Камерун</translation>
+    </message>
+    <message>
+        <source>Canada</source>
+        <translation>Канада</translation>
+    </message>
+    <message>
+        <source>Cape Verde</source>
+        <translation>Кејп Верде</translation>
+    </message>
+    <message>
+        <source>Cayman Islands</source>
+        <translation>Кајмански острови</translation>
+    </message>
+    <message>
+        <source>Chad</source>
+        <translation>Чад</translation>
+    </message>
+    <message>
+        <source>Chile</source>
+        <translation>Чиле</translation>
+    </message>
+    <message>
+        <source>China</source>
+        <translation>Кина</translation>
+    </message>
+    <message>
+        <source>Christmas Island</source>
+        <translation>Божиќни острови</translation>
+    </message>
+    <message>
+        <source>Colombia</source>
+        <translation>Колумбија</translation>
+    </message>
+    <message>
+        <source>Comoros</source>
+        <translation>Коморос</translation>
+    </message>
+    <message>
+        <source>Congo</source>
+        <translation>Конго</translation>
+    </message>
+    <message>
+        <source>Cook Island</source>
+        <translation>Кук Остров</translation>
+    </message>
+    <message>
+        <source>Costa Rica</source>
+        <translation>Коста Рика</translation>
+    </message>
+    <message>
+        <source>Cote d&apos;Ivoire</source>
+        <translation>Коте</translation>
+    </message>
+    <message>
+        <source>Croatia</source>
+        <translation>Хрватска</translation>
+    </message>
+    <message>
+        <source>Cuba</source>
+        <translation>Куба</translation>
+    </message>
+    <message>
+        <source>Cyprus</source>
+        <translation>Кипар</translation>
+    </message>
+    <message>
+        <source>Czech Republic</source>
+        <translation>Чешка</translation>
+    </message>
+    <message>
+        <source>Denmark</source>
+        <translation>Данска</translation>
+    </message>
+    <message>
+        <source>Djibouti</source>
+        <translation>Џибути</translation>
+    </message>
+    <message>
+        <source>Dominica</source>
+        <translation>Доминиканска република</translation>
+    </message>
+    <message>
+        <source>Dominican Republic</source>
+        <translation>Доминиканска република</translation>
+    </message>
+    <message>
+        <source>East Timor</source>
+        <translation>Источен Тиомор</translation>
+    </message>
+    <message>
+        <source>Ecuador</source>
+        <translation>Еквадор</translation>
+    </message>
+    <message>
+        <source>Egypt</source>
+        <translation>Египед</translation>
+    </message>
+    <message>
+        <source>El Salvador</source>
+        <translation>Ел Салвадор</translation>
+    </message>
+    <message>
+        <source>Equatorial Guinea</source>
+        <translation>Екваторијална Гвинеја</translation>
+    </message>
+    <message>
+        <source>Eritrea</source>
+        <translation>Еритреа</translation>
+    </message>
+    <message>
+        <source>Estonia</source>
+        <translation>Естонија</translation>
+    </message>
+    <message>
+        <source>Ethiopia</source>
+        <translation>Етиопија</translation>
+    </message>
+    <message>
+        <source>Falkland Islands</source>
+        <translation>Фалкландски острови</translation>
+    </message>
+    <message>
+        <source>Faroe Islands</source>
+        <translation>Фараонски Острови</translation>
+    </message>
+    <message>
+        <source>Fiji</source>
+        <translation>Фиџи</translation>
+    </message>
+    <message>
+        <source>Finland</source>
+        <translation>Финска</translation>
+    </message>
+    <message>
+        <source>France</source>
+        <translation>Франција</translation>
+    </message>
+    <message>
+        <source>French Guiana</source>
+        <translation>Француска гвинеа</translation>
+    </message>
+    <message>
+        <source>French Polynesia</source>
+        <translation>Француска Полинезија</translation>
+    </message>
+    <message>
+        <source>Gabon</source>
+        <translation>Габон</translation>
+    </message>
+    <message>
+        <source>Gambia</source>
+        <translation>Гамбија</translation>
+    </message>
+    <message>
+        <source>Georgia</source>
+        <translation>Џорџија</translation>
+    </message>
+    <message>
+        <source>Germany</source>
+        <translation>Германија</translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation>Гахана</translation>
+    </message>
+    <message>
+        <source>Gibraltar</source>
+        <translation>Гибралтар</translation>
+    </message>
+    <message>
+        <source>Greece</source>
+        <translation>Грција</translation>
+    </message>
+    <message>
+        <source>Greenland</source>
+        <translation>Гринланд</translation>
+    </message>
+    <message>
+        <source>Grenada</source>
+        <translation>Гренада</translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation>Гвадалупе</translation>
+    </message>
+    <message>
+        <source>Guam</source>
+        <translation>Гуам</translation>
+    </message>
+    <message>
+        <source>Guatemala</source>
+        <translation>Гватемала</translation>
+    </message>
+    <message>
+        <source>Guinea</source>
+        <translation>Гвинеа</translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation>Гвинеа-Бису</translation>
+    </message>
+    <message>
+        <source>Guyana</source>
+        <translation>Гуана</translation>
+    </message>
+    <message>
+        <source>Haiti</source>
+        <translation>Хаити</translation>
+    </message>
+    <message>
+        <source>Holy See</source>
+        <translation>Свето Море</translation>
+    </message>
+    <message>
+        <source>Honduras</source>
+        <translation>Хондарус</translation>
+    </message>
+    <message>
+        <source>Hong Kong</source>
+        <translation>Хон Конг</translation>
+    </message>
+    <message>
+        <source>Hungary</source>
+        <translation>Унгарија</translation>
+    </message>
+    <message>
+        <source>Iceland</source>
+        <translation>Исланд</translation>
+    </message>
+    <message>
+        <source>India</source>
+        <translation>Индиа</translation>
+    </message>
+    <message>
+        <source>Indonesia</source>
+        <translation>Индонесија</translation>
+    </message>
+    <message>
+        <source>Ireland</source>
+        <translation>Ирска</translation>
+    </message>
+    <message>
+        <source>Israel</source>
+        <translation>Израел</translation>
+    </message>
+    <message>
+        <source>Italy</source>
+        <translation>Италија</translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation>Јамајка</translation>
+    </message>
+    <message>
+        <source>Japan</source>
+        <translation>Јапонија</translation>
+    </message>
+    <message>
+        <source>Jordan</source>
+        <translation>Јордан</translation>
+    </message>
+    <message>
+        <source>Kazakhstan</source>
+        <translation>Казахстан</translation>
+    </message>
+    <message>
+        <source>Kenya</source>
+        <translation>Кенија</translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation>Кирибати</translation>
+    </message>
+    <message>
+        <source>Korea</source>
+        <translation>Кореа</translation>
+    </message>
+    <message>
+        <source>Kuwait</source>
+        <translation>Кувајт</translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation>Кургзастан</translation>
+    </message>
+    <message>
+        <source>Laos</source>
+        <translation>Лаос</translation>
+    </message>
+    <message>
+        <source>Latvia</source>
+        <translation>Латвија</translation>
+    </message>
+    <message>
+        <source>Lebanon</source>
+        <translation>Лебанон</translation>
+    </message>
+    <message>
+        <source>Lesotho</source>
+        <translation>Лесто</translation>
+    </message>
+    <message>
+        <source>Liberia</source>
+        <translation>Либериа</translation>
+    </message>
+    <message>
+        <source>Liechtenstein</source>
+        <translation>Лхтенштајн</translation>
+    </message>
+    <message>
+        <source>Lithuania</source>
+        <translation>Литванија</translation>
+    </message>
+    <message>
+        <source>Luxembourg</source>
+        <translation>Луксембург</translation>
+    </message>
+    <message>
+        <source>Macau</source>
+        <translation>Макау</translation>
+    </message>
+    <message>
+        <source>Macedonia</source>
+        <translation>Македонија</translation>
+    </message>
+    <message>
+        <source>Madagascar</source>
+        <translation>Мадагаскар</translation>
+    </message>
+    <message>
+        <source>Malawi</source>
+        <translation>Малави</translation>
+    </message>
+    <message>
+        <source>Malaysia</source>
+        <translation>Малезија</translation>
+    </message>
+    <message>
+        <source>Maldives</source>
+        <translation>Малдиви</translation>
+    </message>
+    <message>
+        <source>Mali</source>
+        <translation>Мали</translation>
+    </message>
+    <message>
+        <source>Malta</source>
+        <translation>Малта</translation>
+    </message>
+    <message>
+        <source>Martinique</source>
+        <translation>Мариникве</translation>
+    </message>
+    <message>
+        <source>Mauritania</source>
+        <translation>Мауритана</translation>
+    </message>
+    <message>
+        <source>Mauritius</source>
+        <translation>Маурициус</translation>
+    </message>
+    <message>
+        <source>Mayotte</source>
+        <translation>Мајот</translation>
+    </message>
+    <message>
+        <source>Mexico</source>
+        <translation>Мексико</translation>
+    </message>
+    <message>
+        <source>Micronesia</source>
+        <translation>Микронезија</translation>
+    </message>
+    <message>
+        <source>Moldova</source>
+        <translation>Молдова</translation>
+    </message>
+    <message>
+        <source>Monaco</source>
+        <translation>Монако</translation>
+    </message>
+    <message>
+        <source>Mongolia</source>
+        <translation>Монголија</translation>
+    </message>
+    <message>
+        <source>Montserrat</source>
+        <translation>Мнтесерат</translation>
+    </message>
+    <message>
+        <source>Morocco</source>
+        <translation>Мароко</translation>
+    </message>
+    <message>
+        <source>Mozambique</source>
+        <translation>Мозамби</translation>
+    </message>
+    <message>
+        <source>Myanmar</source>
+        <translation>Мајамар</translation>
+    </message>
+    <message>
+        <source>Namibia</source>
+        <translation>Намбија</translation>
+    </message>
+    <message>
+        <source>Nauru</source>
+        <translation>Нару</translation>
+    </message>
+    <message>
+        <source>Nepal</source>
+        <translation>Непал</translation>
+    </message>
+    <message>
+        <source>Netherlands</source>
+        <translation>Холандија</translation>
+    </message>
+    <message>
+        <source>New Caledonia</source>
+        <translation>Нова Каледонија</translation>
+    </message>
+    <message>
+        <source>New Zealand</source>
+        <translation>Нов Зеланд</translation>
+    </message>
+    <message>
+        <source>Nicaragua</source>
+        <translation>Никарагва</translation>
+    </message>
+    <message>
+        <source>Niger</source>
+        <translation>Нигерија</translation>
+    </message>
+    <message>
+        <source>Nigeria</source>
+        <translation>Нигерија</translation>
+    </message>
+    <message>
+        <source>Niue</source>
+        <translation>Ниуе</translation>
+    </message>
+    <message>
+        <source>Norway</source>
+        <translation>Норвешка</translation>
+    </message>
+    <message>
+        <source>Oman</source>
+        <translation>Оман</translation>
+    </message>
+    <message>
+        <source>Pakistan</source>
+        <translation>Пакистан</translation>
+    </message>
+    <message>
+        <source>Palau</source>
+        <translation>Палау</translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation>Палестина</translation>
+    </message>
+    <message>
+        <source>Panama</source>
+        <translation>Панама</translation>
+    </message>
+    <message>
+        <source>Papua New Guinea</source>
+        <translation>Папа Нова Гвинеја</translation>
+    </message>
+    <message>
+        <source>Paraguay</source>
+        <translation>Парагвај</translation>
+    </message>
+    <message>
+        <source>Peru</source>
+        <translation>Перу</translation>
+    </message>
+    <message>
+        <source>Philippines</source>
+        <translation>Филипини</translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation>Острови Питчарин</translation>
+    </message>
+    <message>
+        <source>Poland</source>
+        <translation>Полска</translation>
+    </message>
+    <message>
+        <source>Portugal</source>
+        <translation>Португалија</translation>
+    </message>
+    <message>
+        <source>Puerto Rico</source>
+        <translation>Пуерто Рико</translation>
+    </message>
+    <message>
+        <source>Qatar</source>
+        <translation>Кватар</translation>
+    </message>
+    <message>
+        <source>Reunion</source>
+        <translation>Рејунион</translation>
+    </message>
+    <message>
+        <source>Romania</source>
+        <translation>Романија</translation>
+    </message>
+    <message>
+        <source>Russia</source>
+        <translation>Русија</translation>
+    </message>
+    <message>
+        <source>Rwanda</source>
+        <translation>Рованда</translation>
+    </message>
+    <message>
+        <source>Saint Lucia</source>
+        <translation>Сент Луција</translation>
+    </message>
+    <message>
+        <source>Samoa</source>
+        <translation>Самоа</translation>
+    </message>
+    <message>
+        <source>San Marino</source>
+        <translation>Сан Марино</translation>
+    </message>
+    <message>
+        <source>Saudi Arabia</source>
+        <translation>Саудиска Арабија</translation>
+    </message>
+    <message>
+        <source>Senegal</source>
+        <translation>Сенегал</translation>
+    </message>
+    <message>
+        <source>Seychelles</source>
+        <translation>Сејчелс</translation>
+    </message>
+    <message>
+        <source>Sierra Leone</source>
+        <translation>Сиера Леоне</translation>
+    </message>
+    <message>
+        <source>Singapore</source>
+        <translation>Сингапур</translation>
+    </message>
+    <message>
+        <source>Slovakia</source>
+        <translation>Словачка</translation>
+    </message>
+    <message>
+        <source>Slovenia</source>
+        <translation>Словениа</translation>
+    </message>
+    <message>
+        <source>Solomon Islands</source>
+        <translation>Соломонски Острови</translation>
+    </message>
+    <message>
+        <source>Somalia</source>
+        <translation>Сомалија</translation>
+    </message>
+    <message>
+        <source>South Africa</source>
+        <translation>Јужна Африка</translation>
+    </message>
+    <message>
+        <source>Spain</source>
+        <translation>Шпанија</translation>
+    </message>
+    <message>
+        <source>Sri Lanka</source>
+        <translation>Шри Ланка</translation>
+    </message>
+    <message>
+        <source>St. Helena</source>
+        <translation>Св. Хелена</translation>
+    </message>
+    <message>
+        <source>Sudan</source>
+        <translation>Судан</translation>
+    </message>
+    <message>
+        <source>Suriname</source>
+        <translation>Суринам</translation>
+    </message>
+    <message>
+        <source>Swaziland</source>
+        <translation>Свазиланд</translation>
+    </message>
+    <message>
+        <source>Sweden</source>
+        <translation>Шведска</translation>
+    </message>
+    <message>
+        <source>Switzerland</source>
+        <translation>Швајцарија</translation>
+    </message>
+    <message>
+        <source>Taiwan</source>
+        <translation>Тајван</translation>
+    </message>
+    <message>
+        <source>Tajikistan</source>
+        <translation>Таџекистан</translation>
+    </message>
+    <message>
+        <source>Tanzania</source>
+        <translation>Танзанија</translation>
+    </message>
+    <message>
+        <source>Thailand</source>
+        <translation>Тајланд</translation>
+    </message>
+    <message>
+        <source>Togo</source>
+        <translation>Того</translation>
+    </message>
+    <message>
+        <source>Tokelau</source>
+        <translation>Токелау</translation>
+    </message>
+    <message>
+        <source>Tonga</source>
+        <translation>Тонга</translation>
+    </message>
+    <message>
+        <source>Tunisia</source>
+        <translation>Тунезија</translation>
+    </message>
+    <message>
+        <source>Turkey</source>
+        <translation>Турција</translation>
+    </message>
+    <message>
+        <source>Turkmenistan</source>
+        <translation>Туркменистан</translation>
+    </message>
+    <message>
+        <source>Tuvalu</source>
+        <translation>Тувалу</translation>
+    </message>
+    <message>
+        <source>Uganda</source>
+        <translation>Уганда</translation>
+    </message>
+    <message>
+        <source>Ukraine</source>
+        <translation>Украина</translation>
+    </message>
+    <message>
+        <source>Uruguay</source>
+        <translation>Уругвај</translation>
+    </message>
+    <message>
+        <source>Uzbekistan</source>
+        <translation>Узбекистан</translation>
+    </message>
+    <message>
+        <source>Vanuatu</source>
+        <translation>Вануту</translation>
+    </message>
+    <message>
+        <source>Venezuela</source>
+        <translation>Венецуела</translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation>Виетнам</translation>
+    </message>
+    <message>
+        <source>Virgin Islands</source>
+        <translation>Девствени Острови</translation>
+    </message>
+    <message>
+        <source>Western Sahara</source>
+        <translation>Западна Сахара</translation>
+    </message>
+    <message>
+        <source>Yemen</source>
+        <translation>Јемен</translation>
+    </message>
+    <message>
+        <source>Yugoslavia</source>
+        <translation>Југославија</translation>
+    </message>
+    <message>
+        <source>Zambia</source>
+        <translation>Замбија</translation>
+    </message>
+    <message>
+        <source>Zimbabwe</source>
+        <translation>Зимбабве</translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation>Роденден</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation>Годишнина</translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation>Пол</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Машки</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Женски</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Детаљи</translation>
+    </message>
+    <message>
+        <source>Enter Note</source>
+        <translation>Внеси Забелешка</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation>Уреди Име</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation>средно име</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation>Презиме</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Контакти</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Name Title</source>
+        <translation>Име/Наслов</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation>средно име</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation>Презиме</translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation>Суфикс</translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation>Сними како</translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation>Работно Место</translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation>Одделение/Сектор</translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation>Компанија</translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation>Тел. на работа</translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation>Факс на работа</translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation>Службен мобилен</translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation>Адреса за електронска пошта (основна)</translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation>Останати адреси за електронска пошта</translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation>Домашен телефон</translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation>Домашен факс</translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation>Приватен Мобилен</translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation>Улица на фирмата</translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation>Град на фирмата</translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation>Република на Фирмата</translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation>Поштенски код на Фирмата</translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation>Држава на фирмата</translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation>Службен Пејџер</translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation>Интернет страница на фирмата</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Канцеларија</translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation>Професија</translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation>Асистент</translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation>Раководител/менаџер</translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation>Улица</translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation>Град</translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation>Република</translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation>Поштенски код</translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation>Држава</translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation>Интернет страница</translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation>Сопруг/Сопруга</translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation>пол</translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation>Роденден</translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation>Годишнина</translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation>Надимак</translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation>Деца</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Забелешки</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
new file mode 100644
index 0000000..8df713f
--- a/dev/null
+++ b/i18n/mk/advancedfm.ts
@@ -0,0 +1,360 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AdvancedFm</name>
+    <message>
+        <source>Note</source>
+        <translation>Забелешка</translation>
+    </message>
+    <message>
+        <source>That directory does not exist</source>
+        <translation>Директориумот не постои</translation>
+    </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation>Менаџер на Датотеки 
+copyright 2002-2003 од 
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+ и лиценциран под GPL лиценца</translation>
+    </message>
+    <message>
+        <source>Show Hidden Files</source>
+        <translation>Прикажи сокриени датотеки</translation>
+    </message>
+    <message>
+        <source>Change Directory</source>
+        <translation>Промени директориум</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Изврши</translation>
+    </message>
+    <message>
+        <source>Open as text</source>
+        <translation>Отвори како текст</translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation>Акции</translation>
+    </message>
+    <message>
+        <source>Make Directory</source>
+        <translation>Креирај Директориум</translation>
+    </message>
+    <message>
+        <source>Make Symlink</source>
+        <translation>Мреирај Симболичка врска</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Преименувај</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копирај</translation>
+    </message>
+    <message>
+        <source>Copy As</source>
+        <translation>Копирај како</translation>
+    </message>
+    <message>
+        <source>Copy Same Dir</source>
+        <translation>Копирај ист директориум</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation>Премести</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Add To Documents</source>
+        <translation>Додај во документи</translation>
+    </message>
+    <message>
+        <source>Run Command</source>
+        <translation>Изврши команда</translation>
+    </message>
+    <message>
+        <source>File Info</source>
+        <translation>Податоци за датотека</translation>
+    </message>
+    <message>
+        <source>Set Permissions</source>
+        <translation>Постави правила</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Својства</translation>
+    </message>
+    <message>
+        <source>Beam File</source>
+        <translation>Пренеси датотека</translation>
+    </message>
+    <message>
+        <source>AdvancedFm</source>
+        <translation>Напреден Фајл Менаџер</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Неможе да се пренесе 
+тековниот директориум од листата на линкови
+Директорумот не е во листата на линкови!</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Преберување на датотеки</translation>
+    </message>
+    <message>
+        <source>Run Command with Output</source>
+        <translation>Извеши команда со излезни податоци</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Избери се</translation>
+    </message>
+    <message>
+        <source>Switch to Local</source>
+        <translation>Префрлисе на локална листа</translation>
+    </message>
+    <message>
+        <source>Switch to Remote</source>
+        <translation>Префрли се на Далечинска листа
+</translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation>Стави директориум во листа на линкови</translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation>Отстрани го тековниот директориум од листа на линкови</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1 files?</source>
+        <translation>Да избришам
+%1 датотеки?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Delete Directory?</source>
+        <translation>Избриши директориум?</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Избриши %1
+и неговата содржина?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>Избриши 
+%1?</translation>
+    </message>
+    <message>
+        <source>Really copy
+%1 files?</source>
+        <translation>Копирај 
+%1 датотеки?</translation>
+    </message>
+    <message>
+        <source>File Exists!</source>
+        <translation>Датотеката постои!</translation>
+    </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation>%1 посоти. Да ја препишам?</translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation>Неможе да се копира %1 во %2</translation>
+    </message>
+    <message>
+        <source>
+exists. Ok to overwrite?</source>
+        <translation>
+посоти. Да ја препишам?</translation>
+    </message>
+    <message>
+        <source>Could not copy
+</source>
+        <translation>Неможе да се копиа
+</translation>
+    </message>
+    <message>
+        <source>to
+</source>
+        <translation>во</translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation type="unfinished">Копирај</translation>
+    </message>
+    <message>
+        <source> As</source>
+        <translation type="unfinished">Како</translation>
+    </message>
+    <message>
+        <source> already exists.
+Do you really want to delete it?</source>
+        <translation>веќе постои.Да ја избришам?</translation>
+    </message>
+    <message>
+        <source>Could not move
+</source>
+        <translation>Не може да се премести</translation>
+    </message>
+    <message>
+        <source>AdvancedFm Output</source>
+        <translation>Испис на Напреден Фајл менаџер</translation>
+    </message>
+    <message>
+        <source>Advancedfm Beam out</source>
+        <translation>Пренос од Напреден Фајл Менаџер</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>пратено.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Could not rename</source>
+        <translation>Неможе да се преименува</translation>
+    </message>
+</context>
+<context>
+    <name>Output</name>
+    <message>
+        <source>Output</source>
+        <translation>Излез</translation>
+    </message>
+    <message>
+        <source>Save output to file (name only)</source>
+        <translation>Сними го излезот во датотека (само име)</translation>
+    </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation>Постави дозволи на датотека</translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation>Постави дозволи на датотека за:</translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation>Сопственик</translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation>Група</translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation>останати</translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation>Сопственик</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Група</translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation>чиање</translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation>запишување</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>извршување</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/appearance.ts b/i18n/mk/appearance.ts
new file mode 100644
index 0000000..88efa8a
--- a/dev/null
+++ b/i18n/mk/appearance.ts
@@ -0,0 +1,286 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Appearance</name>
+    <message>
+        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
+
+Click here to select an available style.</source>
+        <translation>Стиловите го контолираат начинот на кој објектите како што се копчињата и лизгачите изгледаат во сите апликации
+
+Килкни овде за избор на стил.</translation>
+    </message>
+    <message>
+        <source>Settings...</source>
+        <translation>Подесувања...</translation>
+    </message>
+    <message>
+        <source>Click here to configure the currently selected style.
+
+Note:  This option is not available for all styles.</source>
+        <translation>Кликни овде за конфигурација на избраниот стил
+
+Забелешка: Оваа опција не е достапна за сите стилови.</translation>
+    </message>
+    <message>
+        <source>Window decorations control the way the application title bar and its buttons appear.
+
+Click here to select an available decoration.</source>
+        <translation>Декорациите на прозорци го контролираат начинот на кој насловот и копчињата на апликацијата изгледаат.
+
+Кликни овде за избор на декорација.</translation>
+    </message>
+    <message>
+        <source>Select the desired name, style and size of the default font applications will use.</source>
+        <translation>Избери го името, стилот и големината на основниот фонт за апликациите.</translation>
+    </message>
+    <message>
+        <source>Color schemes are a collection of colors which are used for various parts of the display.
+
+Click here to select an available scheme.</source>
+        <translation>Шемите на бои се колекции на бои кои се користат за разни делови од приказот.
+
+Кликни овде за избор на шема на бои.</translation>
+    </message>
+    <message>
+        <source>Current scheme</source>
+        <translation>Моментално користена шема</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation>Уреди...</translation>
+    </message>
+    <message>
+        <source>Click here to change the colors in the current color scheme.</source>
+        <translation>Килкни овде за промена на боите во моментално користената шема.</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Click here to delete the color scheme selected in the list to the left.</source>
+        <translation>Кликни овде за да се избрише шемата на бои избрана во листата лево.</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Click here to name and save the current color scheme.</source>
+        <translation>Кликни овдека за да се сними и именува моменталната шема на бои.</translation>
+    </message>
+    <message>
+        <source>Force styling for all applications.</source>
+        <translation>Форсирај стилизирање на сите апликации.</translation>
+    </message>
+    <message>
+        <source>Click here to allow all applications to use global appearance settings.</source>
+        <translation>Кликни овде за да се дозволи сите апликации да ги користат глобалните подесувања на изгледот.</translation>
+    </message>
+    <message>
+        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
+        <translation>Исклучи стилизирање на овие апликации (&lt;b&gt;*&lt;/b&gt; може да се користат како специјални знаци):</translation>
+    </message>
+    <message>
+        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
+
+This area allows you to select an application and which settings you wish to disable.</source>
+        <translation>Доколку некои апликации не се прикажуваат правилно со глобалните подесувања на изглед, одредни 
+опции може да бидат исклучени за таа апликација
+
+Овој дел дозволува да се избере аплкација чии подесувања треба да се исклучат.</translation>
+    </message>
+    <message>
+        <source>Binary file(s)</source>
+        <translation>Бинарна датотека/и</translation>
+    </message>
+    <message>
+        <source>Click here to add an application to the list above.</source>
+        <translation>Кликни овде за да се додаде апликација на листата погоре.</translation>
+    </message>
+    <message>
+        <source>Click here to delete the currently selected application.</source>
+        <translation>Кликни овде за да избрише избраната апликација.</translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application up in the list.</source>
+        <translation>Кликни овде за да се премести избраната апликација погоре во листата.</translation>
+    </message>
+    <message>
+        <source>Click here to move the currently selected application down in the list.</source>
+        <translation>Кликни овде за да се премести избраната апликација подоле во листата.</translation>
+    </message>
+    <message>
+        <source>Tab style:</source>
+        <translation>Стил на јазичиња:</translation>
+    </message>
+    <message>
+        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
+
+1. Tabs - normal tabs with text labels only
+2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
+3. Drop down list - a vertical listing of tabs
+4. Drop down list w/icons - a vertical listing of tabs with icons</source>
+        <translation>Kликни овде за избор на стил на јазичињаата (како кај оваа апликација). Стиловите на јазичињатра се:
+
+1. Јазичиња - нормални јазичиња со само со текстуални наслови
+2. Јазичиња/икони - јазичиња со икона за секое јазиче, текстуалното име се појавува само кај активното јазиче
+3. Паѓачка листа - вертикална листа на јазичињата
+4. Паѓачка листа/икони -  верикална листа на јазичињата со икони</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation>Јазичиња</translation>
+    </message>
+    <message>
+        <source>Tabs w/icons</source>
+        <translation>Јазичиња/икони</translation>
+    </message>
+    <message>
+        <source>Drop down list</source>
+        <translation>Паѓачка листа</translation>
+    </message>
+    <message>
+        <source>Drop down list w/icons</source>
+        <translation>Паѓачка листа/икони</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Врв</translation>
+    </message>
+    <message>
+        <source>Click here so that tabs appear at the top of the window.</source>
+        <translation>Клиикни овде за јазичињата да се појауваваат на врвот на прозорот.</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Дно</translation>
+    </message>
+    <message>
+        <source>Click here so that tabs appear at the bottom of the window.</source>
+        <translation>Кликни овде за јазичињата да се појавуваат на дното на прозорот.</translation>
+    </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation>Насока на ротација:</translation>
+    </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation>Подесувања на изгледот</translation>
+    </message>
+    <message>
+        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
+        <translation>Ова е прозорец за преглед. Овдека се гледа новиотт изглед на прозорците како што ги менувате опциите.</translation>
+    </message>
+    <message>
+        <source>Style</source>
+        <translation>Стил</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Фонт</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Бои</translation>
+    </message>
+    <message>
+        <source>Windows</source>
+        <translation>Прозорци</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Напредно</translation>
+    </message>
+    <message>
+        <source>Restart</source>
+        <translation>Рестарт</translation>
+    </message>
+    <message>
+        <source>Do you want to restart %1 now?</source>
+        <translation>Дали сакате да рестартиреате %1 сега?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Save Scheme</source>
+        <translation>Сними Шема</translation>
+    </message>
+    <message>
+        <source>Save scheme</source>
+        <translation>Сними шема</translation>
+    </message>
+    <message>
+        <source>Scheme does already exist.</source>
+        <translation>Шемата веќе постои.</translation>
+    </message>
+    <message>
+        <source>Delete scheme</source>
+        <translation>Избриши Шема</translation>
+    </message>
+    <message>
+        <source>Unable to delete current scheme.</source>
+        <translation>Неможе да се избрише шемата.</translation>
+    </message>
+    <message>
+        <source>&lt;new&gt;</source>
+        <translation>&lt;ново&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>EditScheme</name>
+    <message>
+        <source>Edit scheme</source>
+        <translation>Уреди шема</translation>
+    </message>
+    <message>
+        <source>Click here to select a color for: </source>
+        <translation>Кликни тука за да избереш боја за:</translation>
+    </message>
+</context>
+<context>
+    <name>SampleWindow</name>
+    <message>
+        <source>Sample</source>
+        <translation>Пример</translation>
+    </message>
+    <message>
+        <source>Normal Item</source>
+        <translation>Нормален предмет</translation>
+    </message>
+    <message>
+        <source>Disabled Item</source>
+        <translation>Исклучен предмет</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation>Мени</translation>
+    </message>
+    <message>
+        <source>Normal Text</source>
+        <translation>Нормален текст</translation>
+    </message>
+    <message>
+        <source>Highlighted Text</source>
+        <translation>Одбележан текст</translation>
+    </message>
+    <message>
+        <source>Button</source>
+        <translation>Копчиња</translation>
+    </message>
+    <message>
+        <source>Check Box</source>
+        <translation>Поле за штиклирање</translation>
+    </message>
+    <message>
+        <source>Sample window using the selected settings.</source>
+        <translation>Пример на прозорец користејќи ги избраните подесувања.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/aqpkg.ts b/i18n/mk/aqpkg.ts
new file mode 100644
index 0000000..9a39435
--- a/dev/null
+++ b/i18n/mk/aqpkg.ts
@@ -0,0 +1,689 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CategoryFilterImpl</name>
+    <message>
+        <source>Category Filter</source>
+        <translation>Филтер по категории</translation>
+    </message>
+    <message>
+        <source>Select one or more groups</source>
+        <translation>Ибери една или повеќе групи</translation>
+    </message>
+</context>
+<context>
+    <name>DataManager</name>
+    <message>
+        <source>Reading configuration...</source>
+        <translation>Вчитување на конфигурацијата...</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;Прифати</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+</context>
+<context>
+    <name>InstallDlgImpl</name>
+    <message>
+        <source>Remove
+</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Install
+</source>
+        <translation>Инсталирај</translation>
+    </message>
+    <message>
+        <source>Upgrade
+</source>
+        <translation>Надгради</translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation>(Повторно инсталирај)</translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation>(Надгради)</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation>Цел</translation>
+    </message>
+    <message>
+        <source>Space Avail</source>
+        <translation>Слободен простор</translation>
+    </message>
+    <message>
+        <source>Output</source>
+        <translation>Излез</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Старт</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Аите</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation>
+**** Откажано од Корисник ***</translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation>**** Прекинат Процес ****</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Непознато</translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation>Сними излез</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstallOptionsDlgImpl</name>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>Force Depends</source>
+        <translation>Форсирај Зависности</translation>
+    </message>
+    <message>
+        <source>Force Reinstall</source>
+        <translation>Форсирај повторна инсталација</translation>
+    </message>
+    <message>
+        <source>Force Remove</source>
+        <translation>Форсирај отстранување</translation>
+    </message>
+    <message>
+        <source>Force Overwrite</source>
+        <translation>Офрисрај Препишување</translation>
+    </message>
+    <message>
+        <source>Information Level</source>
+        <translation>Ниво на информации</translation>
+    </message>
+    <message>
+        <source>Errors only</source>
+        <translation>Само грешки</translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation>Нормални пораки</translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation>Информативни пораки</translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation>Детален излез</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>AQPkg - Package Manager</source>
+        <translation>AQPkg - менаџер на пакети</translation>
+    </message>
+    <message>
+        <source>Type the text to search for here.</source>
+        <translation>Искуцај го текстот за пребарување.</translation>
+    </message>
+    <message>
+        <source>Click here to hide the Quick Jump toolbar.</source>
+        <translation>Клики овде за да се сокрие палетата за брзи скокови.</translation>
+    </message>
+    <message>
+        <source>Update lists</source>
+        <translation>Освежи листа</translation>
+    </message>
+    <message>
+        <source>Click here to update package lists from servers.</source>
+        <translation>Кликни овде за да се освежи листата од серверите.</translation>
+    </message>
+    <message>
+        <source>Upgrade</source>
+        <translation>Надгради</translation>
+    </message>
+    <message>
+        <source>Click here to upgrade all installed packages if a newer version is available.</source>
+        <translation>Кликни овде за да се надградат сите инсталирани пакети доколку постои понова верзија.</translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation>Превземи</translation>
+    </message>
+    <message>
+        <source>Click here to download the currently selected package(s).</source>
+        <translation>Кликни овде за да се превземат избраните пакети.</translation>
+    </message>
+    <message>
+        <source>Apply changes</source>
+        <translation>Примени промени</translation>
+    </message>
+    <message>
+        <source>Click here to install, remove or upgrade currently selected package(s).</source>
+        <translation>Кликни овде за да се инталираат, отстранат или надградат избраните пакети.</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Click here to configure this application.</source>
+        <translation>Кликни овде за да ја конфигурираш апликацијава.</translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation>Акции</translation>
+    </message>
+    <message>
+        <source>Show packages not installed</source>
+        <translation>Прикажи ги неинсталираните пакети</translation>
+    </message>
+    <message>
+        <source>Click here to show packages available which have not been installed.</source>
+        <translation>Кликни овде за да се прикажат пакетите кои не се инсталирани.</translation>
+    </message>
+    <message>
+        <source>Show installed packages</source>
+        <translation>Прикажи инсталирани пакети</translation>
+    </message>
+    <message>
+        <source>Click here to show packages currently installed on this device.</source>
+        <translation>Кликни овде за да се прикажат инсталираните пакети.</translation>
+    </message>
+    <message>
+        <source>Show updated packages</source>
+        <translation>Прикажи ги надградените пакети</translation>
+    </message>
+    <message>
+        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
+        <translation>Кликни овде за да се прикажат инсталираните пакети за кои има понова верзија.</translation>
+    </message>
+    <message>
+        <source>Filter by category</source>
+        <translation>Филтрирај по категорија</translation>
+    </message>
+    <message>
+        <source>Click here to list packages belonging to one category.</source>
+        <translation>Кликни овде за да се прикажат пакетите кои припаѓаат на одредена категорија.</translation>
+    </message>
+    <message>
+        <source>Set filter category</source>
+        <translation>Постави категорија за филтрирање</translation>
+    </message>
+    <message>
+        <source>Click here to change package category to used filter.</source>
+        <translation>Кликни овде за се промени категоријата за користениот филтер.</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Пронајди</translation>
+    </message>
+    <message>
+        <source>Click here to search for text in package names.</source>
+        <translation>Кликни овде за пребарување на текст во имињата на пакетите.</translation>
+    </message>
+    <message>
+        <source>Find next</source>
+        <translation>Најди текст</translation>
+    </message>
+    <message>
+        <source>Click here to find the next package name containing the text you are searching for.</source>
+        <translation>Кликни овде за да го најдете следниот пакет кој го содржи текстот кој го барате.</translation>
+    </message>
+    <message>
+        <source>Quick Jump keypad</source>
+        <translation>Палета за брзо скокање</translation>
+    </message>
+    <message>
+        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
+        <translation>Kликни овде за да се прикаже/сокрие панелот за брзо скокање во листата со пакети.</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Click here to hide the find toolbar.</source>
+        <translation>Кликни овде за да се сокрие палетата за пребарување.</translation>
+    </message>
+    <message>
+        <source>Servers:</source>
+        <translation>Сервери:</translation>
+    </message>
+    <message>
+        <source>Click here to select a package feed.</source>
+        <translation>Кликни овде за да се избере извор на пакети.</translation>
+    </message>
+    <message>
+        <source>Packages</source>
+        <translation>Пакети</translation>
+    </message>
+    <message>
+        <source>This is a listing of all packages for the server feed selected above.
+
+A blue dot next to the package name indicates that the package is currently installed.
+
+A blue dot with a star indicates that a newer version of the package is available from the server feed.
+
+Click inside the box at the left to select a package.</source>
+        <translation>Ова е листа на сите пакети од избраниот извор
+
+Плавата точка до името на пакетот покажува дека пакетот е инсталиран.
+
+Плавата точка до името на пакетот покажива дека постои понова верзија на тој пакет во изворот на пакети.
+
+Кликни во квадратчето лево од пакетот за да изберете истиот.</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+    <message>
+        <source>Click here to uninstall the currently selected package(s).</source>
+        <translation>Кликни тука за да се отрстранта избраните пакети.</translation>
+    </message>
+    <message>
+        <source>Building server list:
+<byte value="x9"/>%1</source>
+        <translation>Листана сервери:
+%1</translation>
+    </message>
+    <message>
+        <source>Building package list for:
+<byte value="x9"/>%1</source>
+        <translation>Листа на пакети за:
+%1</translation>
+    </message>
+    <message>
+        <source>Refreshing server package lists</source>
+        <translation>Освежување на листи на пакети</translation>
+    </message>
+    <message>
+        <source>WARNING: Upgrading while
+Opie/Qtopia is running
+is NOT recommended!
+
+Are you sure?
+</source>
+        <translation>ПРЕДУПРЕДУВАЊЕ: Надградба додека
+Oie/Qtopia е вклучена
+НЕ Е ПРЕПОРАЧЛИВО
+
+Дали си сигурен?</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Предупредување</translation>
+    </message>
+    <message>
+        <source>Upgrading installed packages</source>
+        <translation>Надградба на инсталираните пакети</translation>
+    </message>
+    <message>
+        <source>Are you sure you wish to delete
+%1?</source>
+        <translation>Дали сакаш да се избрише %1?</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation>Сигурно?</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Download to where</source>
+        <translation>Превземи во</translation>
+    </message>
+    <message>
+        <source>Enter path to download to</source>
+        <translation>Внеси пат каде да се снимат превземените датотеки</translation>
+    </message>
+    <message>
+        <source>Install Remote Package</source>
+        <translation>Инсталирај пакет</translation>
+    </message>
+    <message>
+        <source>Enter package location</source>
+        <translation>Внеси локација на пакет</translation>
+    </message>
+    <message>
+        <source>Nothing to do</source>
+        <translation>Нема ништо за работа</translation>
+    </message>
+    <message>
+        <source>No packages selected</source>
+        <translation>Нема избрани пакети</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or reinstall
+%1?</source>
+        <translation>Дали сакаш да се отстрани или преинсталира 
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or ReInstall</source>
+        <translation>Отстрани или повторно инсталирај</translation>
+    </message>
+    <message>
+        <source>ReInstall</source>
+        <translation>Повторно Инсталирај</translation>
+    </message>
+    <message>
+        <source>R</source>
+        <translation type="obsolete">Р</translation>
+    </message>
+    <message>
+        <source>Do you wish to remove or upgrade
+%1?</source>
+        <translation>Дали сакаш да се отстрани или надгради
+%1?</translation>
+    </message>
+    <message>
+        <source>Remove or Upgrade</source>
+        <translation>Одстрани или Надгради</translation>
+    </message>
+    <message>
+        <source>U</source>
+        <translation type="obsolete">У</translation>
+    </message>
+    <message>
+        <source>Updating Launcher...</source>
+        <translation>Надградба на стартувач...</translation>
+    </message>
+</context>
+<context>
+    <name>PackageWindow</name>
+    <message>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation>&lt;b&gt;Цел&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Инсталирано во&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Големина&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Оддел&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Име на датотека&lt;/b&gt; -</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt;Инсталирана Верзија&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation>&lt;p&gt;&lt;b&gt; Достапна Верзија&lt;/b&gt; - </translation>
+    </message>
+    <message>
+        <source>Package Information</source>
+        <translation>Информации за пакет</translation>
+    </message>
+    <message>
+        <source>Package information is unavailable</source>
+        <translation>Информациите за пакетот не се достапни</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation>Сервери</translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation>Цел</translation>
+    </message>
+    <message>
+        <source>Proxies</source>
+        <translation>Прокси сервери</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation>Сервер</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Address:</source>
+        <translation>Адреса:</translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation>Активен Сервер</translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation>Надгради</translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation>Цел</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Локација:</translation>
+    </message>
+    <message>
+        <source>Link to root</source>
+        <translation>Поврзи со root</translation>
+    </message>
+    <message>
+        <source>HTTP Proxy</source>
+        <translation>HTTP прокси</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Вклучено</translation>
+    </message>
+    <message>
+        <source>FTP Proxy</source>
+        <translation>FTP прокси</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Корисничко име:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Лозинка:</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/backgammon.ts b/i18n/mk/backgammon.ts
new file mode 100644
index 0000000..5f9519d
--- a/dev/null
+++ b/i18n/mk/backgammon.ts
@@ -0,0 +1,166 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
new file mode 100644
index 0000000..2758c53
--- a/dev/null
+++ b/i18n/mk/backup.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>BackupAndRestore</name>
+    <message>
+        <source>Backup and Restore... working...</source>
+        <translation>Бекап и Обновување...работи...</translation>
+    </message>
+    <message>
+        <source>Backup and Restore</source>
+        <translation>Бекап и Обновување</translation>
+    </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackupAndRestoreBase</name>
+    <message>
+        <source>Backup And Restore</source>
+        <translation>Бекап и Обновување</translation>
+    </message>
+    <message>
+        <source>Backup</source>
+        <translation>Бекап</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Апликации</translation>
+    </message>
+    <message>
+        <source>Save To</source>
+        <translation>Сними во</translation>
+    </message>
+    <message>
+        <source>&amp;Backup</source>
+        <translation>&amp;Бекап</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>Обновување</translation>
+    </message>
+    <message>
+        <source>Select Source</source>
+        <translation>Избери извор</translation>
+    </message>
+    <message>
+        <source>Column 1</source>
+        <translation>Колона 1</translation>
+    </message>
+    <message>
+        <source>&amp;Restore</source>
+        <translation>&amp;Обновување</translation>
+    </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/bounce.ts b/i18n/mk/bounce.ts
new file mode 100644
index 0000000..a38e9c0
--- a/dev/null
+++ b/i18n/mk/bounce.ts
@@ -0,0 +1,122 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KJezzball</name>
+    <message>
+        <source>Bounce</source>
+        <translation>Одбивање</translation>
+    </message>
+    <message>
+        <source>&amp;New game</source>
+        <translation>&amp;Нова Игра</translation>
+    </message>
+    <message>
+        <source>&amp;Pause game</source>
+        <translation>&amp;Паузирај игра</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;за</translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation>&amp;Игра</translation>
+    </message>
+    <message>
+        <source>Score: 00</source>
+        <translation>Резултат: 00</translation>
+    </message>
+    <message>
+        <source>Lives: 0%</source>
+        <translation>Животи: 0%</translation>
+    </message>
+    <message>
+        <source>Filled: 00%</source>
+        <translation>Поле: 00%</translation>
+    </message>
+    <message>
+        <source>Time: 00</source>
+        <translation>Време: 00</translation>
+    </message>
+    <message>
+        <source>Bounce Level %1</source>
+        <translation>Ниво %1</translation>
+    </message>
+    <message>
+        <source>Score: %1</source>
+        <translation>Резултат: %1</translation>
+    </message>
+    <message>
+        <source>Game paused.
+Press P to continue!</source>
+        <translation>Играта е паузирана
+Притисни П за да продолжи!</translation>
+    </message>
+    <message>
+        <source>Game Over!
+Score: %1</source>
+        <translation>Крај на играта
+Резултат: %1</translation>
+    </message>
+    <message>
+        <source>Time: %1</source>
+        <translation>Време: %1</translation>
+    </message>
+    <message>
+        <source>Lives: %1</source>
+        <translation>Животи: %1</translation>
+    </message>
+    <message>
+        <source>Filled: %1%</source>
+        <translation>Поле: %1%</translation>
+    </message>
+    <message>
+        <source>Filled: 0%</source>
+        <translation>Поле: 0%</translation>
+    </message>
+    <message>
+        <source>Successfully cleared more than 75%.
+</source>
+        <translation>Успешно превземени повеќе од 75%.
+</translation>
+    </message>
+    <message>
+        <source>%1 points: 15 points per life
+</source>
+        <translation>%1 поен: 15 поени за живот
+</translation>
+    </message>
+    <message>
+        <source>%1 points: Bonus
+</source>
+        <translation>%1 поени: Бонус</translation>
+    </message>
+    <message>
+        <source>%1 points: Total score
+</source>
+        <translation>%1 поени: Вкупен резултат
+</translation>
+    </message>
+    <message>
+        <source>On to level %1.
+You get %2 lives this time!</source>
+        <translation>Ниво %1.
+Имате %2 животи!</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/buttonsettings.ts b/i18n/mk/buttonsettings.ts
new file mode 100644
index 0000000..36e0230
--- a/dev/null
+++ b/i18n/mk/buttonsettings.ts
@@ -0,0 +1,112 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ButtonSettings</name>
+    <message>
+        <source>Button Settings</source>
+        <translation>ПОдесувања за копчињата</translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
+        <translation>&lt;center&gt;Притисни го или држи го копчето кое треба да смени функција &lt;/center&gt;</translation>
+    </message>
+    <message>
+        <source>Press:</source>
+        <translation>Протоснато:</translation>
+    </message>
+    <message>
+        <source>Hold:</source>
+        <translation>Задржано:</translation>
+    </message>
+    <message>
+        <source>Beam VCard</source>
+        <translation>Пренеси вКартичка</translation>
+    </message>
+    <message>
+        <source>Send eMail</source>
+        <translation>Прати електронска пошта</translation>
+    </message>
+    <message>
+        <source>Toggle Menu</source>
+        <translation>Вкличи мени</translation>
+    </message>
+    <message>
+        <source>Toggle O-Menu</source>
+        <translation>Вклучи О-мени</translation>
+    </message>
+    <message>
+        <source>Show Desktop</source>
+        <translation>Прикажи десктоп</translation>
+    </message>
+    <message>
+        <source>Toggle Recording</source>
+        <translation>Почни со снимање</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
+        <translation>&lt;nobr&gt;игнорирано&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
+        <translation>&lt;nobr&gt;Прикажи&lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation>&lt;nobr&gt;Повикај&lt;b&gt;%1&lt;/b&gt;:&lt;i&gt;%2&gt;&lt;/i&gt;&lt;/nobr&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
+        <translation>&lt;nobr&gt;Повикај&lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&gt;&lt;/i&gt;&lt;/nobr&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlg</name>
+    <message>
+        <source>%1 %2</source>
+        <comment>(hold|press) buttoname</comment>
+        <translation>%1 %2</translation>
+    </message>
+    <message>
+        <source>Held</source>
+        <translation>Задржано</translation>
+    </message>
+    <message>
+        <source>Pressed</source>
+        <translation>Притиснато</translation>
+    </message>
+    <message>
+        <source>No mapping</source>
+        <translation>Без функција</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Основно</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Подесено</translation>
+    </message>
+    <message>
+        <source>Actions</source>
+        <translation>Акции</translation>
+    </message>
+    <message>
+        <source>Show</source>
+        <translation>Прикажи</translation>
+    </message>
+</context>
+<context>
+    <name>RemapDlgBase</name>
+    <message>
+        <source>Action</source>
+        <translation>Акција</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Канал</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Порака</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/buzzword.ts b/i18n/mk/buzzword.ts
new file mode 100644
index 0000000..7b86d94
--- a/dev/null
+++ b/i18n/mk/buzzword.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>BuzzWord</name>
+    <message>
+        <source>buZzword</source>
+        <translation>БуззЗбор</translation>
+    </message>
+    <message>
+        <source>&amp;New game</source>
+        <translation>&amp;Нова Игра</translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation>&amp;Игра</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
+        <translation>&lt;h1&gt;&lt;b&gt;БИНГО !&lt;/b&gt;&lt;/h1&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
new file mode 100644
index 0000000..296f72b
--- a/dev/null
+++ b/i18n/mk/calculator.ts
@@ -0,0 +1,137 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calculator</name>
+    <message>
+        <source>Experimental Calculator</source>
+        <translation>Експериментален Калкулатор</translation>
+    </message>
+    <message>
+        <source>M+</source>
+        <translation>М+</translation>
+    </message>
+    <message>
+        <source>MR</source>
+        <translation>MR</translation>
+    </message>
+    <message>
+        <source>MC</source>
+        <translation>MC</translation>
+    </message>
+    <message>
+        <source>CE</source>
+        <translation>CE</translation>
+    </message>
+    <message>
+        <source>log</source>
+        <translation>log</translation>
+    </message>
+    <message>
+        <source>ln</source>
+        <translation>ln</translation>
+    </message>
+    <message>
+        <source>(</source>
+        <translation>(</translation>
+    </message>
+    <message>
+        <source>)</source>
+        <translation>)</translation>
+    </message>
+    <message>
+        <source>sin</source>
+        <translation>sin</translation>
+    </message>
+    <message>
+        <source>cos</source>
+        <translation>cos</translation>
+    </message>
+    <message>
+        <source>tan</source>
+        <translation>tan</translation>
+    </message>
+    <message>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <source>+/-</source>
+        <translation>+/-</translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation>6</translation>
+    </message>
+    <message>
+        <source>=</source>
+        <translation>=</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>x</source>
+        <translation>x</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation>/</translation>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>
+=</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>.</source>
+        <translation>.</translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation>9</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+</context>
+<context>
+    <name>CalculatorImpl</name>
+    <message>
+        <source>Standard</source>
+        <translation>Стандарден</translation>
+    </message>
+    <message>
+        <source>Calculator</source>
+        <translation>Калкулатор</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/calibrate.ts b/i18n/mk/calibrate.ts
new file mode 100644
index 0000000..d6a0825
--- a/dev/null
+++ b/i18n/mk/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Притисни на кртовите цврсто и 
+прецизно за да се калибрира екранот.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Добредојдовте во Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
new file mode 100644
index 0000000..5681c9e
--- a/dev/null
+++ b/i18n/mk/checkbook.ts
@@ -0,0 +1,524 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Checkbook</name>
+    <message>
+        <source>Checkbook</source>
+        <translation>Сметка</translation>
+    </message>
+    <message>
+        <source>New checkbook</source>
+        <translation>Нова сметка</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Информации</translation>
+    </message>
+    <message>
+        <source>Transactions</source>
+        <translation>Трансакции</translation>
+    </message>
+    <message>
+        <source>Charts</source>
+        <translation>Графикони</translation>
+    </message>
+    <message>
+        <source>Password protect</source>
+        <translation>Заштита со лозинка</translation>
+    </message>
+    <message>
+        <source>Click here to enable/disable password protection of this checkbook.</source>
+        <translation>Кликни овде за да се заштити со лозинка оваа сметка.</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Enter name of checkbook here.</source>
+        <translation>Овде внеси име на смтеката.</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <source>Select type of checkbook here.</source>
+        <translation>Избети тип на сметка овде.</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation>Штедна</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation>Тековна</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation>Кредитна</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation>Пазар на пари</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation>Заеднички фонд</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation>Останато</translation>
+    </message>
+    <message>
+        <source>Bank:</source>
+        <translation>Банка:</translation>
+    </message>
+    <message>
+        <source>Enter name of the bank for this checkbook here.</source>
+        <translation>Внеси име на банката за оваа сметка. </translation>
+    </message>
+    <message>
+        <source>Account number:</source>
+        <translation>Број на сметка:</translation>
+    </message>
+    <message>
+        <source>Enter account number for this checkbook here.</source>
+        <translation>Внеси го бројот на сметката овде.</translation>
+    </message>
+    <message>
+        <source>PIN number:</source>
+        <translation>PIN број:</translation>
+    </message>
+    <message>
+        <source>Enter PIN number for this checkbook here.</source>
+        <translation>Внеси PIN број за оваа сметка.</translation>
+    </message>
+    <message>
+        <source>Starting balance:</source>
+        <translation>Почетна состојба:</translation>
+    </message>
+    <message>
+        <source>Enter the initial balance for this checkbook here.</source>
+        <translation>Внеси ја почетната состојба на оваа сметка.</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Забелешки:</translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this checkbook here.</source>
+        <translation>Внеси додатни информации за сметката.</translation>
+    </message>
+    <message>
+        <source>Current balance: %10.00</source>
+        <translation>Моментална состојба: %10.00</translation>
+    </message>
+    <message>
+        <source>This area shows the current balance in this checkbook.</source>
+        <translation>Овде е прикажана моменталната состојба на оваа сметка.</translation>
+    </message>
+    <message>
+        <source>This is a listing of all transactions entered for this checkbook.
+
+To sort entries by a specific field, click on the column name.</source>
+        <translation>Ова е лита на сите трансакции внесени за оваа сметка.
+
+За да се подреди по полиња, кликни на името на колоната.</translation>
+    </message>
+    <message>
+        <source>Num</source>
+        <translation>Број</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <source>Amount</source>
+        <translation>Сума</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нова</translation>
+    </message>
+    <message>
+        <source>Click here to add a new transaction.</source>
+        <translation>Кликни овде за внесување на нова трансакција.</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Select a transaction and then click here to edit it.</source>
+        <translation>Одбери трансакција и потоа кликни овде за да се измени.</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to delete it.</source>
+        <translation>Избери сметка и потоа кликни овде зада се избрише.</translation>
+    </message>
+    <message>
+        <source>Select the desired chart below and then click on the Draw button.</source>
+        <translation>Избери го саканиот графикон и потоа кликни на Нацртај копчето.</translation>
+    </message>
+    <message>
+        <source>Click here to select the desired chart type.</source>
+        <translation>Кликни на саканиот тип на графикон.</translation>
+    </message>
+    <message>
+        <source>Account balance</source>
+        <translation>Состојба на сметка</translation>
+    </message>
+    <message>
+        <source>Withdrawals by category</source>
+        <translation>Повлекувања на средства по категорија</translation>
+    </message>
+    <message>
+        <source>Deposits by category</source>
+        <translation>Депозити по категорија</translation>
+    </message>
+    <message>
+        <source>Draw</source>
+        <translation>Нацртај</translation>
+    </message>
+    <message>
+        <source>Click here to draw the selected chart.</source>
+        <translation>Кликни овде за да се нацрта избраниот графикон.</translation>
+    </message>
+    <message>
+        <source>Current balance: %1%2</source>
+        <translation>Моментална состојба: %1 %2</translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation>Внеси лозинка</translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation>Внесете лозинка:</translation>
+    </message>
+    <message>
+        <source>Confirm password</source>
+        <translation>Потврдете лозинка</translation>
+    </message>
+    <message>
+        <source>Please confirm your password:</source>
+        <translation>Потврдете лозинка:</translation>
+    </message>
+    <message>
+        <source>Please enter your password to confirm removal of password protection:</source>
+        <translation>Внесете лозинка за да го потврдите бришењето на заштитата со лозинка:</translation>
+    </message>
+    <message>
+        <source>Delete transaction</source>
+        <translation>Избриши трансакција</translation>
+    </message>
+</context>
+<context>
+    <name>Configuration</name>
+    <message>
+        <source>Configure Checkbook</source>
+        <translation>Конфигурирај Сметка</translation>
+    </message>
+    <message>
+        <source>Enter currency symbol:</source>
+        <translation>Внеси симбол за валута:</translation>
+    </message>
+    <message>
+        <source>Enter your local currency symbol here.</source>
+        <translation>Внеси ги симболот на локалната валута овде.</translation>
+    </message>
+    <message>
+        <source>Show whether checkbook is password
+protected</source>
+        <translation>Покажи дали сметката е заштитена 
+со лозинка</translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
+        <translation>Кликни овде за да се избере дали на главниот прозорец да се покажува дали сметката е заштитена или не со лозинка.</translation>
+    </message>
+    <message>
+        <source>Show checkbook balances</source>
+        <translation>Покажи состојби на сметки</translation>
+    </message>
+    <message>
+        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
+        <translation>Кликно овде за да се избере дали главниот прозорец ќе ги прикажува моменталните состојби за секоја сметка.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Checkbook</source>
+        <translation>Сметка</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нова</translation>
+    </message>
+    <message>
+        <source>Click here to create a new checkbook.
+
+You also can select New from the Checkbook menu.</source>
+        <translation>Кликни овде за да се креира нова сметка.
+
+Може исто така да изберете Ново од менито на Сметка.</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here to edit it.
+
+You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
+        <translation>Избери сметка и потоа кликни овде за да се уредува.
+
+Може исто да се одбере Уреди од менито Сметка, или да се кликне и да се задржи на името на сметката.</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Select a checkbook and then click here delete it.
+
+You also can select Delete from the Checkbook menu.</source>
+        <translation>Избери сметка и потоа кликни овде за да се избрише.
+
+Исто така можете да изберете Избриши од менито Сметка.</translation>
+    </message>
+    <message>
+        <source>Configure</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Click here to configure this app.</source>
+        <translation>Кликни овде за да конфигурира апликацијава.</translation>
+    </message>
+    <message>
+        <source>This is a listing of all checkbooks currently available.</source>
+        <translation>Ова е листа на моментално достапните сметки.</translation>
+    </message>
+    <message>
+        <source>Checkbook Name</source>
+        <translation>Име на сметка</translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation>Состојба</translation>
+    </message>
+    <message>
+        <source>Enter password</source>
+        <translation>Внеси лозинка</translation>
+    </message>
+    <message>
+        <source>Please enter your password:</source>
+        <translation>Внесете лозинка:</translation>
+    </message>
+    <message>
+        <source>Delete checkbook</source>
+        <translation>Избриши сметка</translation>
+    </message>
+</context>
+<context>
+    <name>Transaction</name>
+    <message>
+        <source>Transaction for </source>
+        <translation>Трансакција за</translation>
+    </message>
+    <message>
+        <source>Withdrawal</source>
+        <translation>Повлекување средства</translation>
+    </message>
+    <message>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <translation>Овде се избира дали трансакцијата е повлекување на средства или депозит.</translation>
+    </message>
+    <message>
+        <source>Deposit</source>
+        <translation>Депозит</translation>
+    </message>
+    <message>
+        <source>Date:</source>
+        <translation>Датум:</translation>
+    </message>
+    <message>
+        <source>Select date of transaction here.</source>
+        <translation>Избери датум на трансакцијата.</translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation>Број:</translation>
+    </message>
+    <message>
+        <source>Enter check number here.</source>
+        <translation>Внеси број на чек.</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation>Опис:</translation>
+    </message>
+    <message>
+        <source>Enter description of transaction here.</source>
+        <translation>Внеси опис на трансакцијата.</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Категорија:</translation>
+    </message>
+    <message>
+        <source>Select transaction category here.</source>
+        <translation>Избери категорија на трансакцијата.</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation>Избери тип на трансакција.
+
+Опциите варираат во зависност од тоа дали трансакцијата е депозит или повлекување на средства.</translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation>Сума:</translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation>Внеси сума на трансакцијата.
+
+Внесената вредност треба секогаш да е позитивна.</translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation>Такса:</translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation>Внеси ја сумата на таксата поврзана со трансакцијата.
+
+Вредноста секогаш теба да биде позитивна.</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Забелешки:</translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation>Внеси додатни информации за трансакцијата.</translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation>Автомобил</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation>Сметки</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation>ЦД-а</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation>Облека</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation>Компјутер</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation>DVD-а</translation>
+    </message>
+    <message>
+        <source>Eletronics</source>
+        <translation type="obsolete">Електроника</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation>Забава</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation>Храна</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation>Гориво</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Општо</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation>Филмпви</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation>Кирија</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation>Патувања</translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation>Камата на долг</translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation>Напишан чек</translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation>Трансфер</translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation>Кредитна Картичка</translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation>Работа</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation>Член на фамилија</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation>Општо Кредит</translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation>Автоматско Плаќање</translation>
+    </message>
+    <message>
+        <source>Cash</source>
+        <translation>Кеш</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/citytime.ts b/i18n/mk/citytime.ts
new file mode 100644
index 0000000..aec301b
--- a/dev/null
+++ b/i18n/mk/citytime.ts
@@ -0,0 +1,67 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CityTime</name>
+    <message>
+        <source>Time Changing</source>
+        <translation>Промена на Време</translation>
+    </message>
+    <message>
+        <source>There was a problem setting timezone %1</source>
+        <translation>Имаше проблем при подесување на временската зона %1</translation>
+    </message>
+    <message>
+        <source>Restore Time Zone</source>
+        <translation>Врати временска зона</translation>
+    </message>
+    <message>
+        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
+        <translation>Имаше проблем при подесување на временската зона. Часовникот може да е изместен...</translation>
+    </message>
+</context>
+<context>
+    <name>CityTimeBase</name>
+    <message>
+        <source>City Time</source>
+        <translation>Градско Време</translation>
+    </message>
+    <message>
+        <source>Click on one of the set cities to replace it</source>
+        <translation>Кликни на еден од градовите за да се измени</translation>
+    </message>
+</context>
+<context>
+    <name>ZoneMap</name>
+    <message>
+        <source>CITY</source>
+        <translation>Град</translation>
+    </message>
+    <message>
+        <source>Unable to Find Timezone Info</source>
+        <translation>Неможе да се најда информации за временската зона</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
+        <translation>&lt;p&gt;Неможе да се најдат информации за временската зона во %1</translation>
+    </message>
+    <message>
+        <source>Continent</source>
+        <translation>Континент</translation>
+    </message>
+    <message>
+        <source>Select a continent/country here, then select a city</source>
+        <translation>Избери континент/Држава, потоа избери град</translation>
+    </message>
+    <message>
+        <source>City</source>
+        <translation>Град</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t Find Map</source>
+        <translation>Неможе да пронајде карта</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
+        <translation>&lt;p&gt; Неможе да се вчита картата: %1, излегувам</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/clock.ts b/i18n/mk/clock.ts
new file mode 100644
index 0000000..3988ee4
--- a/dev/null
+++ b/i18n/mk/clock.ts
@@ -0,0 +1,97 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Clock</name>
+    <message>
+        <source>Snooze</source>
+        <translation>Одложи</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>PM</translation>
+    </message>
+    <message>
+        <source>Clock</source>
+        <translation>Саат</translation>
+    </message>
+    <message>
+        <source>Stopwatch</source>
+        <translation>Штоперица</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Старт</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation>Ресет</translation>
+    </message>
+    <message>
+        <source>Set Alarm</source>
+        <translation>Намести Аларм</translation>
+    </message>
+    <message>
+        <source>Set date and time.</source>
+        <translation>Намести Датум и време.</translation>
+    </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation>Алармопт е вклучен</translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation>Алармот е исклучен</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Стоп</translation>
+    </message>
+    <message>
+        <source>Clock: Alarm was missed.</source>
+        <translation>Саат: Алармот беше пропуштен.</translation>
+    </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Set_Alarm</name>
+    <message>
+        <source>Set Alarm</source>
+        <translation>Намести Аларм</translation>
+    </message>
+    <message>
+        <source>Hour</source>
+        <translation>Саат</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation>Минута</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation>AM</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>PM</translation>
+    </message>
+    <message>
+        <source>mp3 alarm</source>
+        <translation>mp3 аларм</translation>
+    </message>
+    <message>
+        <source>Snooze Delay
+(minutes)</source>
+        <translation>Одложи (минути)</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/confedit.ts b/i18n/mk/confedit.ts
new file mode 100644
index 0000000..ad17674
--- a/dev/null
+++ b/i18n/mk/confedit.ts
@@ -0,0 +1,78 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>EditWidget</name>
+    <message>
+        <source>File Name:</source>
+        <translation>Име на Датотека:</translation>
+    </message>
+    <message>
+        <source>Group:</source>
+        <translation>Група:</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Клуч:</translation>
+    </message>
+    <message>
+        <source>Value:</source>
+        <translation>Вредност:</translation>
+    </message>
+</context>
+<context>
+    <name>ListViewConfDir</name>
+    <message>
+        <source>Files</source>
+        <translation>Датотеки</translation>
+    </message>
+    <message>
+        <source>Could not open</source>
+        <translation>Неможе да се отвори</translation>
+    </message>
+    <message>
+        <source>The directory </source>
+        <translation>Директориум</translation>
+    </message>
+    <message>
+        <source> could not be opened.</source>
+        <translation>Неможе да се отвори.</translation>
+    </message>
+</context>
+<context>
+    <name>ListViewItemConfFile</name>
+    <message>
+        <source>Could not open</source>
+        <translation>Неможе да се отвори</translation>
+    </message>
+    <message>
+        <source>The file </source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source> could not be opened.</source>
+        <translation>Неможе да се отвори.</translation>
+    </message>
+    <message>
+        <source>no group</source>
+        <translation>нема група</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Conf File Editor</source>
+        <translation>Едитор на конфигурациски датотеки</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Revert</source>
+        <translation>Повторно отвори</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
new file mode 100644
index 0000000..2692ebf
--- a/dev/null
+++ b/i18n/mk/datebook.ts
@@ -0,0 +1,844 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DateBook</name>
+    <message>
+        <source>Calendar</source>
+        <translation>Календар</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нов</translation>
+    </message>
+    <message>
+        <source>Today</source>
+        <translation>Денес</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Ден</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation>Недела</translation>
+    </message>
+    <message>
+        <source>WeekLst</source>
+        <translation>Листа на недели</translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation>Месец</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Пронајди</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation>Уреди...</translation>
+    </message>
+    <message>
+        <source>Event duration is potentially longer
+than interval between repeats.</source>
+        <translation>ТЅраењето на настанот е подолго околку 
+интервалот помежу повторувањата.</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation>Неможе да се менуваат податоците, во моментов се синхронизира</translation>
+    </message>
+    <message>
+        <source>Duplicate Event</source>
+        <translation>Дупликат на настан</translation>
+    </message>
+    <message>
+        <source>Edit Event</source>
+        <translation>Уреди настан</translation>
+    </message>
+    <message>
+        <source> minutes)</source>
+        <translation>Минути)</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Нема доволно простор</translation>
+    </message>
+    <message>
+        <source>Calendar was unable to save
+your changes.
+Free up some space and try again.
+
+Quit anyway?</source>
+        <translation>Календарот неможеше 
+да ги зачува промените
+Ослободи простор и овиди се повторно
+
+Прекини?
+</translation>
+    </message>
+    <message>
+        <source>(Unknown)</source>
+        <translation>(Непознато)</translation>
+    </message>
+    <message>
+        <source>Error!</source>
+        <translation>Грешка!</translation>
+    </message>
+    <message>
+        <source>Fix it</source>
+        <translation>Поправи</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation>Продолжи</translation>
+    </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DateBookDayHeaderBase</name>
+    <message>
+        <source>M</source>
+        <translation>П</translation>
+    </message>
+    <message>
+        <source>T</source>
+        <translation>В</translation>
+    </message>
+    <message>
+        <source>W</source>
+        <translation>С</translation>
+    </message>
+    <message>
+        <source>F</source>
+        <translation>П</translation>
+    </message>
+    <message>
+        <source>S</source>
+        <translation>С</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Понеделник</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Вторник</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Среда</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Четврток</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Петок</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Сабота</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Недела</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookDayView</name>
+    <message>
+        <source>:00p</source>
+        <translation>:00р</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookDayWidget</name>
+    <message>
+        <source>This is an all day event.</source>
+        <translation>Ова е настан кој трае цел ден.</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Почеток</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Крај</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <source> - </source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation>Дуплирај</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation>Испрати</translation>
+    </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DateBookSettings</name>
+    <message>
+        <source>Calendar</source>
+        <translation>Календар</translation>
+    </message>
+    <message>
+        <source>:00 PM</source>
+        <translation>:00 РМ</translation>
+    </message>
+    <message>
+        <source>:00 AM</source>
+        <translation>:00 АМ</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>РМ</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation>АМ</translation>
+    </message>
+    <message>
+        <source>:00</source>
+        <translation>:00</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookSettingsBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation>Особини</translation>
+    </message>
+    <message>
+        <source>Views</source>
+        <translation>Прегледи</translation>
+    </message>
+    <message>
+        <source>Default view:</source>
+        <translation>Основен преглед:</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Ден</translation>
+    </message>
+    <message>
+        <source>Week</source>
+        <translation>Недела</translation>
+    </message>
+    <message>
+        <source>Week List</source>
+        <translation>Листа на недели</translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation>1Месец</translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation>Скокни на моментално време</translation>
+    </message>
+    <message>
+        <source>Row style:</source>
+        <translation>Стил на редови:</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Основен</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Среден</translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation>Голем</translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation>Приказ на време</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Почеток</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation>Почеток-Крај</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Општо</translation>
+    </message>
+    <message>
+        <source>Alarm Settings</source>
+        <translation>Подесувања за аларм</translation>
+    </message>
+    <message>
+        <source>Alarm Preset</source>
+        <translation>Претпоставки за Аларм</translation>
+    </message>
+    <message>
+        <source> minutes</source>
+        <translation>минути</translation>
+    </message>
+    <message>
+        <source>Start viewing events</source>
+        <translation>Почни преглед на настани</translation>
+    </message>
+    <message>
+        <source>Start Time:</source>
+        <translation>Време на Почеток:</translation>
+    </message>
+    <message>
+        <source>:00</source>
+        <translation>:00</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Основни</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Локација:</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Канцеларија</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Категорија:</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeek</name>
+    <message>
+        <source>This is an all day event.</source>
+        <translation>Ова е настан кој трае цел ден.</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekHeader</name>
+    <message>
+        <source>w</source>
+        <translation>С</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekHeaderBase</name>
+    <message>
+        <source>00. Jan-00. Jan</source>
+        <translation>00. Јан-00. Јан</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekLstHeader</name>
+    <message>
+        <source>w</source>
+        <translation>С</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekLstHeaderBase</name>
+    <message>
+        <source>W: 00,00</source>
+        <translation>С: 00,00</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekView</name>
+    <message>
+        <source>Mo</source>
+        <comment>Monday</comment>
+        <translation type="obsolete">Пон.
+Понеделник</translation>
+    </message>
+    <message>
+        <source>Tu</source>
+        <comment>Tuesday</comment>
+        <translation type="obsolete">Втор.
+Вторник</translation>
+    </message>
+    <message>
+        <source>We</source>
+        <comment>Wednesday</comment>
+        <translation type="obsolete">Сред,
+Среда</translation>
+    </message>
+    <message>
+        <source>Th</source>
+        <comment>Thursday</comment>
+        <translation type="obsolete">Чет.
+Четврток</translation>
+    </message>
+    <message>
+        <source>Fr</source>
+        <comment>Friday</comment>
+        <translation type="obsolete">Пет.
+Петок</translation>
+    </message>
+    <message>
+        <source>Sa</source>
+        <comment>Saturday</comment>
+        <translation type="obsolete">Саб.
+Сабота</translation>
+    </message>
+    <message>
+        <source>Su</source>
+        <comment>Sunday</comment>
+        <translation type="obsolete">Нед.
+Недела</translation>
+    </message>
+    <message>
+        <source>p</source>
+        <translation>п</translation>
+    </message>
+</context>
+<context>
+    <name>DateEntry</name>
+    <message>
+        <source>Start Time</source>
+        <translation>Време на почеток</translation>
+    </message>
+    <message>
+        <source>End Time</source>
+        <translation>Време на завршување</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Календар</translation>
+    </message>
+    <message>
+        <source>Repeat...</source>
+        <translation>Повторување...</translation>
+    </message>
+    <message>
+        <source>Daily...</source>
+        <translation>Дневен...</translation>
+    </message>
+    <message>
+        <source>Weekly...</source>
+        <translation>Неделно...</translation>
+    </message>
+    <message>
+        <source>Monthly...</source>
+        <translation>Месечно...</translation>
+    </message>
+    <message>
+        <source>Yearly...</source>
+        <translation>Годишно...</translation>
+    </message>
+    <message>
+        <source>No Repeat...</source>
+        <translation>Без Повторување...</translation>
+    </message>
+</context>
+<context>
+    <name>DateEntryBase</name>
+    <message>
+        <source>New Event</source>
+        <translation>Нов настан</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Локација</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation>Категорија</translation>
+    </message>
+    <message>
+        <source>Meeting</source>
+        <translation>Состанок</translation>
+    </message>
+    <message>
+        <source>Lunch</source>
+        <translation>Ручек</translation>
+    </message>
+    <message>
+        <source>Dinner</source>
+        <translation>Ручек</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation>Патување</translation>
+    </message>
+    <message>
+        <source>Description </source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Канцеларија</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Start - End </source>
+        <translation>Почеток-Крај</translation>
+    </message>
+    <message>
+        <source>Jan 02 00</source>
+        <translation>Јан 02 00</translation>
+    </message>
+    <message>
+        <source>Start time</source>
+        <translation>Време на почеток</translation>
+    </message>
+    <message>
+        <source>All day</source>
+        <translation>Цел Ден</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation>Временска зона</translation>
+    </message>
+    <message>
+        <source>&amp;Alarm</source>
+        <translation>&amp;Аларм</translation>
+    </message>
+    <message>
+        <source> minutes</source>
+        <translation>минути</translation>
+    </message>
+    <message>
+        <source>Silent</source>
+        <translation>Тивок</translation>
+    </message>
+    <message>
+        <source>Loud</source>
+        <translation>Гласно</translation>
+    </message>
+    <message>
+        <source>Repeat</source>
+        <translation>Повторување</translation>
+    </message>
+    <message>
+        <source>No Repeat...</source>
+        <translation>Без Повторување...</translation>
+    </message>
+    <message>
+        <source>Note...</source>
+        <translation>Забелешка...</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NoteEntryBase</name>
+    <message>
+        <source>Edit Note</source>
+        <translation>Уреди забелешка</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
+        <translation>&lt;b&gt;1/10&lt;/b&gt; Ручек</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Start</source>
+        <translation>Почеток</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Крај</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 секој</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>%1 секој</translation>
+    </message>
+    <message>
+        <source>The %1 %1 of every</source>
+        <translation>%1 %1 од секој</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Понеделник</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Вторник</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Среда</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Четврток</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Петок</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Сабота</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Недела</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>ст</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>нд</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>рд</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>тх</translation>
+    </message>
+</context>
+<context>
+    <name>RepeatEntry</name>
+    <message>
+        <source>No Repeat</source>
+        <translation>Без Повторување</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>денови</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>недели</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Повторување по</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Ден</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>месеци</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>години</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>денови</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>ден</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>недели</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>недела</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>месец</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>година</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>и</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>, и</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, и</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RepeatEntryBase</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>Вар1</translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation>Вар 2</translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation>Недела Вар</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>месеци</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>години</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/drawpad.ts b/i18n/mk/drawpad.ts
new file mode 100644
index 0000000..d44f131
--- a/dev/null
+++ b/i18n/mk/drawpad.ts
@@ -0,0 +1,448 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DrawPad</name>
+    <message>
+        <source>Delete All</source>
+        <translation>Избриши се/</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Вметни</translation>
+    </message>
+    <message>
+        <source>Import...</source>
+        <translation>Вметни...</translation>
+    </message>
+    <message>
+        <source>Export</source>
+        <translation>Извези</translation>
+    </message>
+    <message>
+        <source>Export...</source>
+        <translation>Извези...</translation>
+    </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation>Преглед на слики</translation>
+    </message>
+    <message>
+        <source>Thumbnail View...</source>
+        <translation>Преглед на слики...</translation>
+    </message>
+    <message>
+        <source>Page Information</source>
+        <translation>Информации за страната</translation>
+    </message>
+    <message>
+        <source>Page Information...</source>
+        <translation>Информации за страната...</translation>
+    </message>
+    <message>
+        <source>Anti-Aliasing</source>
+        <translation>Фино рендерирање</translation>
+    </message>
+    <message>
+        <source>Tools</source>
+        <translation>Алатки</translation>
+    </message>
+    <message>
+        <source>New Page</source>
+        <translation>Нова Страна</translation>
+    </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation>Кликни овде да додадеш страна.</translation>
+    </message>
+    <message>
+        <source>Clear Page</source>
+        <translation>Исчисти страна</translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation>Кликни овде да се избрише активната страна.</translation>
+    </message>
+    <message>
+        <source>Delete Page</source>
+        <translation>Избриши страна</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation>Кликни овде да се избрише активната страна.</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation>Врати акција назад</translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation>Кликни овде за да се опништи последната акција.</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <translation>Повтори</translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation>Кликни овде да се повтори последната акција.</translation>
+    </message>
+    <message>
+        <source>First Page</source>
+        <translation>Прва Страна</translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation>Кликни овде за да ја видиш првата страна.</translation>
+    </message>
+    <message>
+        <source>Previous Page</source>
+        <translation>Претходна Страна</translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation>Кликни овде за да ја видиш претходната страна.</translation>
+    </message>
+    <message>
+        <source>Next Page</source>
+        <translation>Следна Страна</translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation>Кликни овде за да ја видиш следната страна.</translation>
+    </message>
+    <message>
+        <source>Last Page</source>
+        <translation>Последна Страна</translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation>кликни овде за да ја видиш последната страна.</translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation>Кликни овде за избереш една од алатките за цртање линии.</translation>
+    </message>
+    <message>
+        <source>Draw Point</source>
+        <translation>Точка на цртање</translation>
+    </message>
+    <message>
+        <source>Draw Line</source>
+        <translation>Нацртај Линија</translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation>Кликни овде за да избереш една од алатките за цртање правоаголници.</translation>
+    </message>
+    <message>
+        <source>Draw Rectangle</source>
+        <translation>Нацртај Квадрат</translation>
+    </message>
+    <message>
+        <source>Draw Filled Rectangle</source>
+        <translation>Настра исполнет квадрат</translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation>Кликни овде за да избереш една од алатките за цртање елипси.</translation>
+    </message>
+    <message>
+        <source>Draw Ellipse</source>
+        <translation>Нацртај Елипса</translation>
+    </message>
+    <message>
+        <source>Draw Filled Ellipse</source>
+        <translation>Нацртај Пополнета Елипса</translation>
+    </message>
+    <message>
+        <source>Insert Text</source>
+        <translation>Вметни текст</translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation>Кликни овде да се избере алатката за пишување.</translation>
+    </message>
+    <message>
+        <source>Fill Region</source>
+        <translation>Област на пополнување</translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation>Кликни овде да се избере алатката за пополнување.</translation>
+    </message>
+    <message>
+        <source>Erase Point</source>
+        <translation>Точка на бришење</translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation>Кликни овде да се избере алатката за бришење.</translation>
+    </message>
+    <message>
+        <source>Pen Width</source>
+        <translation>Ширина на пенкалото</translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation>Кликни овде за да се избере дебелината на пенкалото.</translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation>Кликни овде да ја избереш бојата со која се црта.</translation>
+    </message>
+    <message>
+        <source>Pen Color</source>
+        <translation>Боја на пенкалото</translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation>Кликни овде да се избере бојата со која се пополнуваат објектите.</translation>
+    </message>
+    <message>
+        <source>Fill Color</source>
+        <translation>Боја на пополнување</translation>
+    </message>
+    <message>
+        <source>Do you want to clear
+the current page?</source>
+        <translation>Дали сакаш да ја испразниш
+активната страна?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Do you want to delete
+the current page?</source>
+        <translation>Дали сакаш да ја избришрш
+тековната страна?</translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation>Табла за Цртање - Страна %1%2</translation>
+    </message>
+    <message>
+        <source>Do you want to delete
+all the pages?</source>
+        <translation>Дали сакаш да ги избришеш 
+сите страници?</translation>
+    </message>
+</context>
+<context>
+    <name>ExportDialog</name>
+    <message>
+        <source>DrawPad - Export</source>
+        <translation>Табла за Цртање - Извези</translation>
+    </message>
+    <message>
+        <source>Page Selection</source>
+        <translation>Избор на страница</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Current</source>
+        <translation>Овој/Оваа</translation>
+    </message>
+    <message>
+        <source>Range</source>
+        <translation>Опсег</translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation>До:</translation>
+    </message>
+    <message>
+        <source>Export As</source>
+        <translation>Извези како</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Format:</source>
+        <translation>Формат:</translation>
+    </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImportDialog</name>
+    <message>
+        <source>DrawPad - Import</source>
+        <translation>Табла за Цртање - Вметни</translation>
+    </message>
+    <message>
+        <source>Automatic preview</source>
+        <translation>Автоматски преглед</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewPageDialog</name>
+    <message>
+        <source>New Page</source>
+        <translation>Нова Страна</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Основни</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Наслов:</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation>Ширина:</translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation>Висина:</translation>
+    </message>
+    <message>
+        <source>Background</source>
+        <translation>Позадина</translation>
+    </message>
+    <message>
+        <source>White</source>
+        <translation>Бела</translation>
+    </message>
+    <message>
+        <source>Pen Color</source>
+        <translation>Боја на Пенкало</translation>
+    </message>
+    <message>
+        <source>Fill Color</source>
+        <translation>Боја на пополнување</translation>
+    </message>
+</context>
+<context>
+    <name>PageInformationDialog</name>
+    <message>
+        <source>Page Information</source>
+        <translation>Информации за страната</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Основни</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Наслов:</translation>
+    </message>
+    <message>
+        <source>Date:</source>
+        <translation>Датум:</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Width:</source>
+        <translation>Ширина:</translation>
+    </message>
+    <message>
+        <source>Height:</source>
+        <translation>Висина:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Title: %1</source>
+        <translation>Наслов: %1</translation>
+    </message>
+    <message>
+        <source>Dimension: %1x%2</source>
+        <translation>Димензии: %1x%2</translation>
+    </message>
+    <message>
+        <source>Date: %1</source>
+        <translation>Датум: %1</translation>
+    </message>
+</context>
+<context>
+    <name>TextToolDialog</name>
+    <message>
+        <source>Insert Text</source>
+        <translation>Вметни текст</translation>
+    </message>
+</context>
+<context>
+    <name>ThumbnailView</name>
+    <message>
+        <source>DrawPad - Thumbnail View</source>
+        <translation>Табла за цртање - Преглед на слики</translation>
+    </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation>Кликни овде да додадеш страна.</translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation>Кликни овде да се избрише активната страна.</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation>Кликни овде да се избрише активната страна.</translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation>Кликни овде за да ја поместиш активната страна погоре во листата.</translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation>Кликни овде за да ја поместиш активната страна подоле во листата.</translation>
+    </message>
+    <message>
+        <source>Clear Page</source>
+        <translation>Исчисти страна</translation>
+    </message>
+    <message>
+        <source>Do you want to clear
+the selected page?</source>
+        <translation>Дали сакаш да ја испразниш
+активната страна?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Delete Page</source>
+        <translation>Избриши страна</translation>
+    </message>
+    <message>
+        <source>Do you want to delete
+the selected page?</source>
+        <translation>Дали сакаш да ја испразниш
+активната страна?</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
new file mode 100644
index 0000000..f60f7f4
--- a/dev/null
+++ b/i18n/mk/embeddedkonsole.ts
@@ -0,0 +1,237 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CommandEditDialog</name>
+    <message>
+        <source>Command Selection</source>
+        <translation>Избор на команди</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">нов</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="obsolete">уреди</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">избриши</translation>
+    </message>
+    <message>
+        <source>up</source>
+        <translation type="obsolete">нагоре</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation type="obsolete">надоле</translation>
+    </message>
+</context>
+<context>
+    <name>CommandEditDialogBase</name>
+    <message>
+        <source>Commands</source>
+        <translation>Команди</translation>
+    </message>
+    <message>
+        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
+        <translation>&lt;B&gt;Команди&lt;/B&gt;:</translation>
+    </message>
+    <message>
+        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
+        <translation>&lt;B&gt;Препорачани Команди&lt;?B&gt;:</translation>
+    </message>
+</context>
+<context>
+    <name>Konsole</name>
+    <message>
+        <source>Terminal</source>
+        <translation>Терминал</translation>
+    </message>
+    <message>
+        <source>Micro</source>
+        <translation>Микро</translation>
+    </message>
+    <message>
+        <source>Small Fixed</source>
+        <translation>Мал ограничен</translation>
+    </message>
+    <message>
+        <source>Medium Fixed</source>
+        <translation>Среден ограничен</translation>
+    </message>
+    <message>
+        <source>Command List</source>
+        <translation>Листа на Команди</translation>
+    </message>
+    <message>
+        <source>Show command list</source>
+        <translation>Покажи листа на команди</translation>
+    </message>
+    <message>
+        <source>Hide command list</source>
+        <translation>Скриј листа на команди</translation>
+    </message>
+    <message>
+        <source>Tabs on Bottom</source>
+        <translation>Јазичиња доле</translation>
+    </message>
+    <message>
+        <source>Tabs on Top</source>
+        <translation>Јазичиња горе</translation>
+    </message>
+    <message>
+        <source>Green on Black</source>
+        <translation>Зелено на Црно</translation>
+    </message>
+    <message>
+        <source>Black on White</source>
+        <translation>Црно на Бело</translation>
+    </message>
+    <message>
+        <source>White on Black</source>
+        <translation>Бело на Црно</translation>
+    </message>
+    <message>
+        <source>Black on Transparent</source>
+        <translation>Црно на Прозирно</translation>
+    </message>
+    <message>
+        <source>Black on Red</source>
+        <translation>Црно на Црвено</translation>
+    </message>
+    <message>
+        <source>Red on Black</source>
+        <translation>Црвено на Црно</translation>
+    </message>
+    <message>
+        <source>Green on Yellow</source>
+        <translation>Зелено на Жолто</translation>
+    </message>
+    <message>
+        <source>Blue on Magenta</source>
+        <translation>Плаво на Црвено</translation>
+    </message>
+    <message>
+        <source>Magenta on Blue</source>
+        <translation>Црвено на Плаво</translation>
+    </message>
+    <message>
+        <source>Cyan on White</source>
+        <translation>Плаво на Бело</translation>
+    </message>
+    <message>
+        <source>White on Cyan</source>
+        <translation>Бело на Плава</translation>
+    </message>
+    <message>
+        <source>Blue on Black</source>
+        <translation>Плаво на Црно</translation>
+    </message>
+    <message>
+        <source>Amber on Black</source>
+        <translation>Црвено на Црно</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation>Сопствено</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Фонт</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Бои</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нов</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Внеси</translation>
+    </message>
+    <message>
+        <source>Space</source>
+        <translation>Простор</translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation>Јазиче</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Горе</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Надоле</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Залепи</translation>
+    </message>
+    <message>
+        <source>Quick Edit</source>
+        <translation>Брзо Уредување</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Лево</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Десно</translation>
+    </message>
+    <message>
+        <source>ScrollBar</source>
+        <translation>Лизгач</translation>
+    </message>
+    <message>
+        <source>Wrap</source>
+        <translation>Завиткај</translation>
+    </message>
+    <message>
+        <source>Use Beep</source>
+        <translation>Користи звучен сигнал</translation>
+    </message>
+    <message>
+        <source>Show Command List</source>
+        <translation>Покажи листа на команди</translation>
+    </message>
+    <message>
+        <source>Hide Command List</source>
+        <translation>Скриј листа на команди</translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Command Selection</source>
+        <translation>Избор на команди</translation>
+    </message>
+</context>
+<context>
+    <name>editCommandBase</name>
+    <message>
+        <source>Add command</source>
+        <translation>Додади команда</translation>
+    </message>
+    <message>
+        <source>Enter command to add:</source>
+        <translation>Внеси Команда за додавање:</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/euroconv.ts b/i18n/mk/euroconv.ts
new file mode 100644
index 0000000..3b1456a
--- a/dev/null
+++ b/i18n/mk/euroconv.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/fifteen.ts b/i18n/mk/fifteen.ts
new file mode 100644
index 0000000..6f8df08
--- a/dev/null
+++ b/i18n/mk/fifteen.ts
@@ -0,0 +1,42 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FifteenMainWindow</name>
+    <message>
+        <source>Randomize</source>
+        <translation>Растури</translation>
+    </message>
+    <message>
+        <source>Solve</source>
+        <translation>Реши</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Игра</translation>
+    </message>
+    <message>
+        <source>Fifteen Pieces</source>
+        <translation>Петнаесет Парчиња</translation>
+    </message>
+</context>
+<context>
+    <name>PiecesTable</name>
+    <message>
+        <source>Fifteen Pieces</source>
+        <translation>Петнаесет Парчиња</translation>
+    </message>
+    <message>
+        <source>Congratulations!
+You win the game!</source>
+        <translation>Браво!
+Победи!</translation>
+    </message>
+    <message>
+        <source>R&amp;andomize Pieces</source>
+        <translation>Р&amp;астури парчиња</translation>
+    </message>
+    <message>
+        <source>&amp;Reset Pieces</source>
+        <translation>&amp;Постави парчиња</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/formatter.ts b/i18n/mk/formatter.ts
new file mode 100644
index 0000000..1cfd02b
--- a/dev/null
+++ b/i18n/mk/formatter.ts
@@ -0,0 +1,213 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FormatterApp</name>
+    <message>
+        <source>Formatter</source>
+        <translation>Форматер</translation>
+    </message>
+    <message>
+        <source>Storage Type</source>
+        <translation>Тип на медиум</translation>
+    </message>
+    <message>
+        <source>File Systems</source>
+        <translation>Податочни Системи</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Формат</translation>
+    </message>
+    <message>
+        <source>Main</source>
+        <translation>Главен</translation>
+    </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this 
+page may cause your system 
+to stop functioning properly!!</source>
+        <translation type="obsolete">ВНИМАНИЕ:
+Промената на параметрите на оваа
+страна може да предизвикагрешки 
+во функционирањето на системот!!</translation>
+    </message>
+    <message>
+        <source>Edit fstab</source>
+        <translation>Уреди го fstab</translation>
+    </message>
+    <message>
+        <source>Check Disk</source>
+        <translation>Провери Диск</translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation>Уред</translation>
+    </message>
+    <message>
+        <source>Mount Point</source>
+        <translation>Точка на прикачување</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Напредни</translation>
+    </message>
+    <message>
+        <source>Format?!?</source>
+        <translation type="obsolete">Формат?!?</translation>
+    </message>
+    <message>
+        <source>Really format
+</source>
+        <translation>Да се Форматира
+</translation>
+    </message>
+    <message>
+        <source>
+with </source>
+        <translation type="obsolete">
+со</translation>
+    </message>
+    <message>
+        <source> filesystem?!?
+You will loose all data!!</source>
+        <translation type="obsolete">податочен систем?!?
+Ќе ги изгубите сите податоци!!</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Could not format.
+Unknown type</source>
+        <translation>Неможе да се форматира.
+Непознат тип</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Formatter Output</source>
+        <translation>Излез од форматер</translation>
+    </message>
+    <message>
+        <source>Trying to umount.</source>
+        <translation>Се обидувам да откачам.</translation>
+    </message>
+    <message>
+        <source>umount failed!</source>
+        <translation>откачувањето беше неуспешно!</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>
+&amp;ОК</translation>
+    </message>
+    <message>
+        <source>Could not umount.
+Device is busy!</source>
+        <translation>Неможев да откачам.Уредот е зафатен!</translation>
+    </message>
+    <message>
+        <source>Trying to format.</source>
+        <translation>Се обидувам да форматирам.</translation>
+    </message>
+    <message>
+        <source>No such device!</source>
+        <translation>Нема таков уред!</translation>
+    </message>
+    <message>
+        <source>
+has been successfully formatted.</source>
+        <translation>
+Беше успешно форматиран.</translation>
+    </message>
+    <message>
+        <source>Trying to mount.</source>
+        <translation type="obsolete">Се обидувам да закачам.</translation>
+    </message>
+    <message>
+        <source>Card mount failed!</source>
+        <translation>Прикачувањето на картичката беше неуспешно!</translation>
+    </message>
+    <message>
+        <source>
+has been successfully mounted.</source>
+        <translation type="obsolete">
+беше успешно прикачена.</translation>
+    </message>
+    <message>
+        <source>You can now close the output window.</source>
+        <translation>Сега можете да го затворите прозорот за излез на податоци.</translation>
+    </message>
+    <message>
+        <source>Internal</source>
+        <translation>Внатрешна</translation>
+    </message>
+    <message>
+        <source>Storage Type : </source>
+        <translation type="obsolete">Тип на медиум:</translation>
+    </message>
+    <message>
+        <source>Total: %1 kB ( %d mB)
+</source>
+        <translation>Вкупно %1 кВ (%d mB)
+</translation>
+    </message>
+    <message>
+        <source>Used: %1 kB ( %d mB)
+</source>
+        <translation>Искористено %1 кВ (%d mB)
+</translation>
+    </message>
+    <message>
+        <source>Available: %1 kB ( %d mB)</source>
+        <translation>Слободни: %1 kB (%d mB)</translation>
+    </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/go.ts b/i18n/mk/go.ts
new file mode 100644
index 0000000..59b67f4
--- a/dev/null
+++ b/i18n/mk/go.ts
@@ -0,0 +1,56 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GoMainWidget</name>
+    <message>
+        <source>New Game</source>
+        <translation>Нова Игра</translation>
+    </message>
+    <message>
+        <source>Pass</source>
+        <translation>Обид</translation>
+    </message>
+    <message>
+        <source>Resign</source>
+        <translation>Повлечи се</translation>
+    </message>
+    <message>
+        <source>Two player option</source>
+        <translation>Оции за два играчи</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Игра</translation>
+    </message>
+</context>
+<context>
+    <name>GoWidget</name>
+    <message>
+        <source>White %1, Black %2. </source>
+        <translation>Бели %1, Црни %2.</translation>
+    </message>
+    <message>
+        <source>White wins.</source>
+        <translation>Белиот победи.</translation>
+    </message>
+    <message>
+        <source>Black wins.</source>
+        <translation>Црниот победи.</translation>
+    </message>
+    <message>
+        <source>A draw.</source>
+        <translation>Нерешено.</translation>
+    </message>
+    <message>
+        <source>I pass</source>
+        <translation>1 обид</translation>
+    </message>
+    <message>
+        <source>Prisoners: black %1, white %2</source>
+        <translation>Заробеници: црн %1, бел %2</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation>Оди</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/helpbrowser.ts b/i18n/mk/helpbrowser.ts
new file mode 100644
index 0000000..2a12b83
--- a/dev/null
+++ b/i18n/mk/helpbrowser.ts
@@ -0,0 +1,37 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpBrowser</name>
+    <message>
+        <source>Backward</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Додали врска </translation>
+    </message>
+    <message>
+        <source>Remove from Bookmarks</source>
+        <translation>Извади од листа на врски</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Листа на врски</translation>
+    </message>
+    <message>
+        <source>Help Browser</source>
+        <translation>Прегледувач на помош</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/kbill.ts b/i18n/mk/kbill.ts
new file mode 100644
index 0000000..f2549e2
--- a/dev/null
+++ b/i18n/mk/kbill.ts
@@ -0,0 +1,64 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KBill</name>
+    <message>
+        <source>kBill</source>
+        <translation>кБили</translation>
+    </message>
+    <message>
+        <source>New game</source>
+        <translation>Нова игра</translation>
+    </message>
+    <message>
+        <source>Pause game</source>
+        <translation>Паузирај игра</translation>
+    </message>
+    <message>
+        <source>Story of kBill</source>
+        <translation>Приказната за кБили</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Правила</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Помош</translation>
+    </message>
+    <message>
+        <source>Pause Game</source>
+        <translation>Паузирај игра</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
+        <translation>&lt;b&gt;Приказната&lt;/b&gt;Повторно, судбината на светот е во твои раце! Злобниот хакер, познат по неговиот надимак Били, го има создадено наопасниот компјутерски вирус. Вирус толку моќен што од обичен компјутер може да направи микробранова печка. Били се клонирал во милиони-билиони-трилиони мали  микро-Били. Нивната единствена цел е да го рашират вирусот кој беше паметно маскиран како оперативен систем. Како систем администратор и ектерминатор, твоја работа е да го спречиш Били во неговиот напад.</translation>
+    </message>
+    <message>
+        <source>The story of KBill</source>
+        <translation>Прикаската за кБили</translation>
+    </message>
+    <message>
+        <source>The rules of KBill</source>
+        <translation>Правила на кБили</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
+        <translation>&lt;b&gt;Правила&lt;/b&gt;&lt;p&gt;кБили е дизајнирана да може да ја игра било кој во фамилијата. Годините - деновите на тестирање и консултации со најевтините дизајнери резултираа со игра која е лесна за користење, а сепак не наликува на Мекинтош.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Удри го Били (кликни)&lt;/LI&gt;&lt;LI&gt;Рестартирај го компјутерот (кликни)&lt;/LI&gt;&lt;LI&gt;Собери ги украдените оперативни системи &amp; врати ги (влечи) на нивните копјутери &lt;/LI&gt;&lt;LI&gt;Одвлечи ја корпата врз искрите&lt;/LI&gt;&lt;LI&gt;Бодувањето се базира на времето на играње, како и бонусите за убивање Били.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Остатокот највероватно и сами ќе го сватите. Ние го свативме, така да неможе да е толку тешко</translation>
+    </message>
+</context>
+<context>
+    <name>UI</name>
+    <message>
+        <source>After Level</source>
+        <translation>Следно ниво</translation>
+    </message>
+    <message>
+        <source>Your score</source>
+        <translation>Бодови</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/kcheckers.ts b/i18n/mk/kcheckers.ts
new file mode 100644
index 0000000..ec27db1
--- a/dev/null
+++ b/i18n/mk/kcheckers.ts
@@ -0,0 +1,129 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KCheckers</name>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Нова</translation>
+    </message>
+    <message>
+        <source>&amp;Undo Move</source>
+        <translation>&amp;Врати потег</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Крај</translation>
+    </message>
+    <message>
+        <source>&amp;Beginner</source>
+        <translation>&amp;Почетничко</translation>
+    </message>
+    <message>
+        <source>&amp;Novice</source>
+        <translation>&amp;Слабо</translation>
+    </message>
+    <message>
+        <source>&amp;Average</source>
+        <translation>&amp;Просечно</translation>
+    </message>
+    <message>
+        <source>&amp;Good</source>
+        <translation>&amp;Добро</translation>
+    </message>
+    <message>
+        <source>&amp;Expert</source>
+        <translation>&amp;Еџпертско</translation>
+    </message>
+    <message>
+        <source>&amp;Master</source>
+        <translation>&amp;Мајсторско</translation>
+    </message>
+    <message>
+        <source>&amp;Show Numeration</source>
+        <translation>&amp;Прикажи нумерации</translation>
+    </message>
+    <message>
+        <source>&amp;English Rules</source>
+        <translation>&amp;Англиски правила</translation>
+    </message>
+    <message>
+        <source>&amp;Russian Rules</source>
+        <translation>&amp;Руски правила</translation>
+    </message>
+    <message>
+        <source>&amp;Green Board</source>
+        <translation>&amp;Зелена Табла</translation>
+    </message>
+    <message>
+        <source>&amp;Marble Board</source>
+        <translation>&amp;Мермерна Табла</translation>
+    </message>
+    <message>
+        <source>&amp;Wooden Board</source>
+        <translation>&amp;Дрвена Табла</translation>
+    </message>
+    <message>
+        <source>What&apos;s This</source>
+        <translation>Што е ова</translation>
+    </message>
+    <message>
+        <source>&amp;Rules of Play</source>
+        <translation>&amp;Правила на игра</translation>
+    </message>
+    <message>
+        <source>&amp;About KCheckers</source>
+        <translation>&amp;За кДама</translation>
+    </message>
+    <message>
+        <source>About &amp;Qt</source>
+        <translation>за &amp;QT</translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation>&amp;Игра</translation>
+    </message>
+    <message>
+        <source>&amp;Skill</source>
+        <translation>&amp;Ниво</translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation>&amp;Опции</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Помош</translation>
+    </message>
+    <message>
+        <source> New Game </source>
+        <translation>Нова игра</translation>
+    </message>
+    <message>
+        <source> Undo Move </source>
+        <translation>Врати потег</translation>
+    </message>
+    <message>
+        <source> Rules of Play </source>
+        <translation>Правила на игра</translation>
+    </message>
+    <message>
+        <source>Go!</source>
+        <translation>Старт!</translation>
+    </message>
+    <message>
+        <source>Congratulation! You have won!</source>
+        <translation>Победивте!</translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation>Почекајте...</translation>
+    </message>
+    <message>
+        <source>You have lost. Game over.</source>
+        <translation>Изгубивте.</translation>
+    </message>
+    <message>
+        <source>Incorrect course.</source>
+        <translation>Неправилна патека.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/keypebble.ts b/i18n/mk/keypebble.ts
new file mode 100644
index 0000000..a1cd042
--- a/dev/null
+++ b/i18n/mk/keypebble.ts
@@ -0,0 +1,292 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KRFBConnection</name>
+    <message>
+        <source>Connected</source>
+        <translation>Поврзано</translation>
+    </message>
+    <message>
+        <source>Connection Refused</source>
+        <translation>ПОврзувањето е одбиено</translation>
+    </message>
+    <message>
+        <source>Host not found</source>
+        <translation>Не е пронајден серверот</translation>
+    </message>
+    <message>
+        <source>Read Error: QSocket reported an error reading
+data, the remote host has probably dropped the
+connection.</source>
+        <translation>Грешка при читање: QSocket пријав грешка при читање
+на податоците, поврзаниот компјутер највероватно ја
+прекинал врската.</translation>
+    </message>
+    <message>
+        <source>QSocket reported an invalid error code</source>
+        <translation>QSocket пријави непозната грешка</translation>
+    </message>
+</context>
+<context>
+    <name>KRFBDecoder</name>
+    <message>
+        <source>Waiting for server initialisation...</source>
+        <translation>Чекам иницијализаија на серверот...</translation>
+    </message>
+    <message>
+        <source>Waiting for desktop name...</source>
+        <translation>Чекам име на компјутер...</translation>
+    </message>
+    <message>
+        <source>Connected to %1</source>
+        <translation>Поврзано со %1</translation>
+    </message>
+    <message>
+        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
+        <translation>Грешка на протокол: Добиена е порака бр. %1,а се очекува порака за освежување.</translation>
+    </message>
+    <message>
+        <source>Protocol Error: An unknown encoding was used by the server %1</source>
+        <translation>Грешка на протокол: Серверот %1 користеше непозната кодна табела </translation>
+    </message>
+</context>
+<context>
+    <name>KRFBLogin</name>
+    <message>
+        <source>Waiting for server version...</source>
+        <translation>Чекам верзија на серверот...</translation>
+    </message>
+    <message>
+        <source>Error: Invalid server version, %1</source>
+        <translation>Грешка: Невалидна верзија на сервер, %1</translation>
+    </message>
+    <message>
+        <source>Error: Unsupported server version, %1</source>
+        <translation>Грешка: Неподрана верзија на сервер, %1</translation>
+    </message>
+    <message>
+        <source>Logged in</source>
+        <translation>Логирано</translation>
+    </message>
+    <message>
+        <source>Error: This server requires a password, but none has been specified.
+</source>
+        <translation>Грешка: Серверот бара лозинка, лозинката не е специфицирана.
+</translation>
+    </message>
+    <message>
+        <source>Error: The password you specified was incorrect.</source>
+        <translation>Грешка: Внесената лозинка не е валидна.</translation>
+    </message>
+    <message>
+        <source>Error: Too many invalid login attempts have been made
+to this account, please try later.</source>
+        <translation>Грешка: Премногу невалидни обиди за логирање
+на овој корисник, обидете се подоцна.</translation>
+    </message>
+    <message>
+        <source>Login Failed</source>
+        <translation>Неуспешно логирање</translation>
+    </message>
+    <message>
+        <source>Too many failures</source>
+        <translation>Премногу грешки</translation>
+    </message>
+</context>
+<context>
+    <name>KVNC</name>
+    <message>
+        <source>VNC Viewer</source>
+        <translation>VNC прегледувач</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Ново поврзување</translation>
+    </message>
+    <message>
+        <source>Open Bookmark</source>
+        <translation>Отвори линк</translation>
+    </message>
+    <message>
+        <source>Delete Bookmark</source>
+        <translation>Избриши линк</translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation>Цел екран</translation>
+    </message>
+    <message>
+        <source>Send Contrl-Alt-Delete</source>
+        <translation>Прати Ctrl-ALt-Del</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation>Откачи врска</translation>
+    </message>
+    <message>
+        <source>Next Click is Double Click</source>
+        <translation>Следнити кликање е двојно кликање</translation>
+    </message>
+    <message>
+        <source>Next Click is Right Click</source>
+        <translation>Следното кликаже е клик со десно копче</translation>
+    </message>
+    <message>
+        <source>Stop Full Screen</source>
+        <translation>Затвори цел екран</translation>
+    </message>
+    <message>
+        <source>Connected to remote host</source>
+        <translation>Поврзи се со сервер</translation>
+    </message>
+    <message>
+        <source>Logged in to remote host</source>
+        <translation>Логиран на сервер</translation>
+    </message>
+    <message>
+        <source>Connection closed</source>
+        <translation>Прекината врска</translation>
+    </message>
+</context>
+<context>
+    <name>KVNCBookmarkDlgBase</name>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Листа на линкови</translation>
+    </message>
+    <message>
+        <source>Choose a bookmark that you would like to open</source>
+        <translation>Избери линк кој треба да се отвори</translation>
+    </message>
+</context>
+<context>
+    <name>KVNCConnDlgBase</name>
+    <message>
+        <source>VNC Viewer Connection</source>
+        <translation>VNC поврзување</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation>Сервер</translation>
+    </message>
+    <message>
+        <source>The password of the VNC server</source>
+        <translation>Лозинката на VNC серверот</translation>
+    </message>
+    <message>
+        <source>Show Password</source>
+        <translation>Покажи лозинка</translation>
+    </message>
+    <message>
+        <source>Toggle obscuring the password</source>
+        <translation>Вклучи прикривање на лозинката</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Лозинка:</translation>
+    </message>
+    <message>
+        <source>The name of the VNC server</source>
+        <translation>Име на VNC серверот</translation>
+    </message>
+    <message>
+        <source>Bookmark Name:</source>
+        <translation>Име на линк:</translation>
+    </message>
+    <message>
+        <source>The host name of the VNC server</source>
+        <translation>Име на компјутерот со VNC сервер</translation>
+    </message>
+    <message>
+        <source>Host Name:</source>
+        <translation>Име на сервер:</translation>
+    </message>
+    <message>
+        <source>Display Number:</source>
+        <translation>Број на приказ:</translation>
+    </message>
+    <message>
+        <source>The display number of the VNC server</source>
+        <translation>Број на приказ на VNC серверот</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>Request shared session</source>
+        <translation>Барај сесија која се дели</translation>
+    </message>
+    <message>
+        <source>Allow other users to connect to the VNC server</source>
+        <translation>Дозволи и други корисници да се поврзуваат со VNC серверот</translation>
+    </message>
+    <message>
+        <source>Request 8-bit session</source>
+        <translation>Барај 8-битна сесија</translation>
+    </message>
+    <message>
+        <source>Request that the VNC server transfer 8 bit color</source>
+        <translation>Барај пренос на 8-битна боја од VNC серверот</translation>
+    </message>
+    <message>
+        <source>Delay between requesting updates from the server</source>
+        <translation>Време помеѓу освежувања од серверот</translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>Scale the remote display to fit on the PDA (Slow)</source>
+        <translation>Намалиго екранот на серверот за да го собере на PDA-то (споро)</translation>
+    </message>
+    <message>
+        <source>Scale Factor</source>
+        <translation>Фактор на намалување</translation>
+    </message>
+    <message>
+        <source>Milliseconds</source>
+        <translation>Милисекунди</translation>
+    </message>
+    <message>
+        <source>Raise on bell</source>
+        <translation>Крени на повик</translation>
+    </message>
+    <message>
+        <source>Check for screen updates every:</source>
+        <translation>Провери освежувања на екран секои:</translation>
+    </message>
+    <message>
+        <source>Encodings</source>
+        <translation>Кодни табели</translation>
+    </message>
+    <message>
+        <source>Hextile encoding</source>
+        <translation>Хекса кодни табели</translation>
+    </message>
+    <message>
+        <source>CoRRE encoding</source>
+        <translation>CoRRE кодна табела</translation>
+    </message>
+    <message>
+        <source>RRE encoding</source>
+        <translation>REE кодна табела</translation>
+    </message>
+    <message>
+        <source>Copy rectangle encoding</source>
+        <translation>Копирај правоаголник</translation>
+    </message>
+    <message>
+        <source>Enable transmiting identical rectangles as references to existing data</source>
+        <translation>Вклучи емитирање на идентични правоаголници како рефернеци за постоечки податоци</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/kpacman.ts b/i18n/mk/kpacman.ts
new file mode 100644
index 0000000..3bb24fa
--- a/dev/null
+++ b/i18n/mk/kpacman.ts
@@ -0,0 +1,243 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keys</name>
+    <message>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Основи</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>Change Direction Keys</source>
+        <translation>Смени копчиња за насока</translation>
+    </message>
+    <message>
+        <source>Undefined key</source>
+        <translation>Недефинирано копче</translation>
+    </message>
+</context>
+<context>
+    <name>Kpacman</name>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Ново</translation>
+    </message>
+    <message>
+        <source>&amp;Pause</source>
+        <translation>&amp;Пауза</translation>
+    </message>
+    <message>
+        <source>&amp;Hall of fame</source>
+        <translation>&amp;Хала на славни</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Исклучи</translation>
+    </message>
+    <message>
+        <source>&amp;Hide Mousecursor</source>
+        <translation>&amp;Скриј курсор</translation>
+    </message>
+    <message>
+        <source>&amp;Select graphic scheme</source>
+        <translation>&amp;Избери графичка шема</translation>
+    </message>
+    <message>
+        <source>&amp;Pause in Background</source>
+        <translation>&amp;Паузирај во позадина</translation>
+    </message>
+    <message>
+        <source>&amp;Continue in Foreground</source>
+        <translation>&amp;Продолжи</translation>
+    </message>
+    <message>
+        <source>Change &amp;keys...</source>
+        <translation>Промени &amp;копчиња...</translation>
+    </message>
+    <message>
+        <source>@PACKAGE@ - @VERSION@
+
+Joerg Thoennissen (joe@dsite.de)
+
+A pacman game for the KDE Desktop
+
+The program based on the source of ksnake
+by Michel Filippi (mfilippi@sade.rhein-main.de).
+The design was strongly influenced by the pacman
+(c) 1980 MIDWAY MFG.CO.
+
+I like to thank my girlfriend Elke Krueers for
+the last 10 years of her friendship.
+</source>
+        <translation>
+Овој програм е базиран на изворниот код на кЗмија
+од Michel Fillipi.
+
+
+
+
+
+
+
+</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Помош</translation>
+    </message>
+    <message>
+        <source>KPacman</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KpacmanWidget</name>
+    <message>
+        <source>The bitfont could not be contructed.
+
+The file &apos;@FONTNAME@&apos; does not exist,
+or is of an unknown format.</source>
+        <translation>Неможе да се вчита фонтот.
+
+Датотеката &apos;@FONTNAME@&apos; не постои
+или е во непознат формат.</translation>
+    </message>
+</context>
+<context>
+    <name>Referee</name>
+    <message>
+        <source>GAME  OVER</source>
+        <translation>Крај на Игра</translation>
+    </message>
+    <message>
+        <source>PLAYER ONE</source>
+        <translation>Прв Играч</translation>
+    </message>
+    <message>
+        <source>READY!</source>
+        <translation>Спремно!</translation>
+    </message>
+    <message>
+        <source>PAUSED</source>
+        <translation>Паузирано</translation>
+    </message>
+    <message>
+        <source>CHARACTER</source>
+        <translation>Карактер</translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation>/</translation>
+    </message>
+    <message>
+        <source>NICKNAME</source>
+        <translation>Надимак</translation>
+    </message>
+    <message>
+        <source>-SHADOW</source>
+        <translation>-СЕНКА</translation>
+    </message>
+    <message>
+        <source>&quot;BLINKY&quot;</source>
+        <translation>„ТРЕПКО“</translation>
+    </message>
+    <message>
+        <source>-SPEEDY</source>
+        <translation>-БРЗИ</translation>
+    </message>
+    <message>
+        <source>&quot;PINKY&quot;</source>
+        <translation>„ПИНКИ“</translation>
+    </message>
+    <message>
+        <source>-BASHFUL</source>
+        <translation>-СРАМЕЖЛИВ</translation>
+    </message>
+    <message>
+        <source>&quot;INKY&quot;</source>
+        <translation>„ИНКИ“</translation>
+    </message>
+    <message>
+        <source>-POKEY</source>
+        <translation>-ПОКИ</translation>
+    </message>
+    <message>
+        <source>&quot;CLYDE&quot;</source>
+        <translation>„КЛАЈД“</translation>
+    </message>
+    <message>
+        <source>QTOPIA PORT: CATALIN CLIMOV</source>
+        <translation>Портирано на qtopia: Caltin Climov</translation>
+    </message>
+    <message>
+        <source>PRESS CURSOR TO START</source>
+        <translation>ПРИТИСНИ НА КУРСОР ЗА СТАРТ</translation>
+    </message>
+</context>
+<context>
+    <name>Score</name>
+    <message>
+        <source>  1UP </source>
+        <translation>1НАГОРЕ</translation>
+    </message>
+    <message>
+        <source> HIGH SCORE </source>
+        <translation>РЕЗУЛТАТИ</translation>
+    </message>
+    <message>
+        <source>  2UP </source>
+        <translation>2НАГОРЕ</translation>
+    </message>
+    <message>
+        <source>     CONGRATULATIONS      </source>
+        <translation>ЧЕСТИТКИ</translation>
+    </message>
+    <message>
+        <source>    YOU HAVE ARCHIEVED    </source>
+        <translation>УСПЕАВЕТ</translation>
+    </message>
+    <message>
+        <source>  A SCORE IN THE TOP 10.  </source>
+        <translation>РЕЗУЛТАТОТ Е ВО ВРВНИТЕ 10.</translation>
+    </message>
+    <message>
+        <source>RNK   SCORE  NAME   DATE</source>
+        <translation>НИВО  БОДОВИ  ИМЕ  ДАТУМ</translation>
+    </message>
+    <message>
+        <source>PAUSED</source>
+        <translation>ПАУЗИРАНО</translation>
+    </message>
+    <message>
+        <source>@YY@/@MM@/@DD@</source>
+        <translation>@@YY@/@MM@/@DD@</translation>
+    </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Status</name>
+    <message>
+        <source>The pixmap could not be contructed.
+
+The file &apos;@PIXMAPNAME@&apos; does not exist,
+or is of an unknown format.</source>
+        <translation>Сликата неможеше да се вчита
+
+Датотеката &apos;@PIXMAPNAME@&apos; не постои
+или е во невалиден формат.</translation>
+    </message>
+    <message>
+        <source>Initialization Error</source>
+        <translation>грешка при иницијализација</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/language.ts b/i18n/mk/language.ts
new file mode 100644
index 0000000..8f78801
--- a/dev/null
+++ b/i18n/mk/language.ts
@@ -0,0 +1,24 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LanguageSettings</name>
+    <message>
+        <source>English</source>
+        <translation>Англиски</translation>
+    </message>
+    <message>
+        <source>default</source>
+        <translation>основен</translation>
+    </message>
+</context>
+<context>
+    <name>LanguageSettingsBase</name>
+    <message>
+        <source>Language Settings</source>
+        <translation>Подесувања за јазик</translation>
+    </message>
+    <message>
+        <source>Select language</source>
+        <translation>Избери јазик</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
new file mode 100644
index 0000000..92c9598
--- a/dev/null
+++ b/i18n/mk/launchersettings.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LauncherSettings</name>
+    <message>
+        <source>Launcher Settings</source>
+        <translation>Подесувања на мени</translation>
+    </message>
+    <message>
+        <source>Taskbar</source>
+        <translation>Палета</translation>
+    </message>
+    <message>
+        <source>O-Menu</source>
+        <translation>О-мени</translation>
+    </message>
+    <message>
+        <source>Tabs</source>
+        <translation>Табови</translation>
+    </message>
+</context>
+<context>
+    <name>MenuSettings</name>
+    <message>
+        <source>Load applets in O-Menu:</source>
+        <translation>Вчитај аплети во О-мени:</translation>
+    </message>
+    <message>
+        <source>Show Launcher tabs in O-Menu</source>
+        <translation>Прикажи ги јазичињата од главното во О-менито</translation>
+    </message>
+    <message>
+        <source>Check the applets that you want to have included in the O-Menu.</source>
+        <translation>Одбележи ги аплетите кои ќе бидат во О-менито.</translation>
+    </message>
+    <message>
+        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
+        <translation>Додава содржини од главното мени во О-менито.</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Sample 1</source>
+        <translation>Пример 1</translation>
+    </message>
+    <message>
+        <source>Sample 2</source>
+        <translation>Пример 2</translation>
+    </message>
+    <message>
+        <source>Sample 3</source>
+        <translation>Пример 3</translation>
+    </message>
+</context>
+<context>
+    <name>TabDialog</name>
+    <message>
+        <source>Edit Tab</source>
+        <translation>Уреди Јазиче</translation>
+    </message>
+    <message>
+        <source>Background</source>
+        <translation>Позадина</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Фонт</translation>
+    </message>
+    <message>
+        <source>Icons</source>
+        <translation>Икони</translation>
+    </message>
+    <message>
+        <source>Previewing %1</source>
+        <translation>Преглед на %1</translation>
+    </message>
+    <message>
+        <source>This is a rough preview of what the currently selected Tab will look like.</source>
+        <translation>Ова е груб преглед на  избраното јазиче.</translation>
+    </message>
+    <message>
+        <source>Use a custom font</source>
+        <translation>Користи свој фонт</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <source>Ruled</source>
+        <translation>Подредено</translation>
+    </message>
+    <message>
+        <source>Solid color</source>
+        <translation>Полна боја</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Слика</translation>
+    </message>
+    <message>
+        <source>Select...</source>
+        <translation>Избери...</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Основни</translation>
+    </message>
+    <message>
+        <source>Size:</source>
+        <translation>Големина:</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Мало</translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation>Големо</translation>
+    </message>
+    <message>
+        <source>Color:</source>
+        <translation>Боја:</translation>
+    </message>
+</context>
+<context>
+    <name>TabsSettings</name>
+    <message>
+        <source>Launcher Tabs:</source>
+        <translation>Јазичиња на главно мени:</translation>
+    </message>
+    <message>
+        <source>foobar</source>
+        <translation>панел</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Enable big busy indicator</source>
+        <translation>Вклучи голем индикатор за зафатеност</translation>
+    </message>
+    <message>
+        <source>Enable blinking busy indicator</source>
+        <translation>Вклучи трепкачки индикатор за зафатеност</translation>
+    </message>
+    <message>
+        <source>Select the Launcher Tab you want to edit or delete.</source>
+        <translation>Избери го јазичето што треба да се уредува или брише.</translation>
+    </message>
+    <message>
+        <source>Adds a new Tab to the Launcher.</source>
+        <translation>Додава ново јазиче на главното мени.</translation>
+    </message>
+    <message>
+        <source>Opens a new dialog to customize the select Tab.</source>
+        <translation>Отвара нов дијалок за подесување на избраното јазиче.</translation>
+    </message>
+    <message>
+        <source>Deletes a Tab from the Launcher.</source>
+        <translation>Брише јазиче од главното мени.</translation>
+    </message>
+    <message>
+        <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
+        <translation>Активирај го ова ако сакаш да видиш голем индикатор за зафатеност на средината на екранот наместо тој во панелот.</translation>
+    </message>
+    <message>
+        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
+        <translation>Активирај го ова ако сакаш трепкачки индикатор на зафатеност за време на вчитвуањето на апликациите во главното мени.</translation>
+    </message>
+    <message>
+        <source>All Tabs</source>
+        <translation>Сите јазичиња</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Документи</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Not implemented yet</source>
+        <translation>Не е имплементирано</translation>
+    </message>
+</context>
+<context>
+    <name>TaskbarSettings</name>
+    <message>
+        <source>Load applets in Taskbar:</source>
+        <translation>Вчитај аплети во панелот:</translation>
+    </message>
+    <message>
+        <source>Check the applets that you want displayed in the Taskbar.</source>
+        <translation>Одбери ги аплетите што треба да се прикажат во панелот.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libmpeg3plugin.ts b/i18n/mk/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/hu/libmpeg3plugin.ts
+++ b/i18n/mk/lib.ts
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
new file mode 100644
index 0000000..1201f24
--- a/dev/null
+++ b/i18n/mk/libbatteryapplet.ts
@@ -0,0 +1,85 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>BatteryStatus</name>
+    <message>
+        <source>Battery status</source>
+        <translation>Состојба на батерија</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation>неможе да се отвори датотека</translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation>Полнење на двата уреда</translation>
+    </message>
+    <message>
+        <source>Charging</source>
+        <translation>Полнење</translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining</source>
+        <translation>Проценти на остнато напојување</translation>
+    </message>
+    <message>
+        <source>Battery status: </source>
+        <translation>Состојба на батерија:</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <translation>Добро</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Ниско</translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation>Многу ниско</translation>
+    </message>
+    <message>
+        <source>Critical</source>
+        <translation>Критично</translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation>Непознато</translation>
+    </message>
+    <message>
+        <source>On backup power</source>
+        <translation>На помошно напојување</translation>
+    </message>
+    <message>
+        <source>Power on-line</source>
+        <translation>Вклучено напојување</translation>
+    </message>
+    <message>
+        <source>External power disconnected</source>
+        <translation>Иклучено надворешно напојување</translation>
+    </message>
+    <message>
+        <source>Battery time remaining</source>
+        <translation>Останато време</translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation>Проценти на остнато напојување:</translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation>Останато време:</translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation>Нема додатна батерија</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/libbend.ts b/i18n/mk/libbend.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/libbend.ts
+++ b/i18n/mk/libbend.ts
diff --git a/i18n/mk/libcardmonapplet.ts b/i18n/mk/libcardmonapplet.ts
new file mode 100644
index 0000000..81f491d
--- a/dev/null
+++ b/i18n/mk/libcardmonapplet.ts
@@ -0,0 +1,33 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CardMonitor</name>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation>Осфрли SD/MMC картичка</translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation>Исфрли картичка 0: %1</translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation>Исфрли картичка 1: %1</translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation>Грешка при исфрлањето на CF/PCMCIA картичката!</translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation>грешка при исфрлање на SD/MMC картичка!</translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation>Нова картичка:</translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation>Исфрлена:</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libclipboardapplet.ts b/i18n/mk/libclipboardapplet.ts
new file mode 100644
index 0000000..c523362
--- a/dev/null
+++ b/i18n/mk/libclipboardapplet.ts
@@ -0,0 +1,17 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ClipboardApplet</name>
+    <message>
+        <source>Cut</source>
+        <translation>Исечи</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копирај</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Залепи</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libclockapplet.ts b/i18n/mk/libclockapplet.ts
new file mode 100644
index 0000000..db92457
--- a/dev/null
+++ b/i18n/mk/libclockapplet.ts
@@ -0,0 +1,5 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
+</TS>
diff --git a/i18n/mk/libflat.ts b/i18n/mk/libflat.ts
new file mode 100644
index 0000000..3923ef7
--- a/dev/null
+++ b/i18n/mk/libflat.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Decoration</name>
+    <message>
+        <source>Flat</source>
+        <translation>Рамна</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libflatstyle.ts b/i18n/mk/libflatstyle.ts
new file mode 100644
index 0000000..63af223
--- a/dev/null
+++ b/i18n/mk/libflatstyle.ts
@@ -0,0 +1,10 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Рамна</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/libfreshstyle.ts b/i18n/mk/libfreshstyle.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/zh_CN/libfreshstyle.ts
+++ b/i18n/mk/libfreshstyle.ts
diff --git a/i18n/zh_CN/libftplib.ts b/i18n/mk/libftplib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/zh_CN/libftplib.ts
+++ b/i18n/mk/libftplib.ts
diff --git a/i18n/mk/libhomeapplet.ts b/i18n/mk/libhomeapplet.ts
new file mode 100644
index 0000000..a7e0d52
--- a/dev/null
+++ b/i18n/mk/libhomeapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HomeApplet</name>
+    <message>
+        <source>Home shortcut</source>
+        <translation>Кратенка до домот</translation>
+    </message>
+    <message>
+        <source>Desktop</source>
+        <translation>Десктоп</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libinterfaces.ts b/i18n/mk/libinterfaces.ts
new file mode 100644
index 0000000..3e43c25
--- a/dev/null
+++ b/i18n/mk/libinterfaces.ts
@@ -0,0 +1,162 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InterfaceAdvanced</name>
+    <message>
+        <source>Advanced Interface Information</source>
+        <translation>Напредни информации за интерфејс</translation>
+    </message>
+    <message>
+        <source>eth0</source>
+        <translation>eth0</translation>
+    </message>
+    <message>
+        <source>IP Address</source>
+        <translation>IP Адреса</translation>
+    </message>
+    <message>
+        <source>Interface</source>
+        <translation>интерфејс</translation>
+    </message>
+    <message>
+        <source>Subnet Mask</source>
+        <translation>Subnet Маска</translation>
+    </message>
+    <message>
+        <source>0.0.0.0</source>
+        <translation>0.0.0.0</translation>
+    </message>
+    <message>
+        <source>DHCP Information</source>
+        <translation>DHCP информации</translation>
+    </message>
+    <message>
+        <source>DHCP Server</source>
+        <translation>DHCP Сервер</translation>
+    </message>
+    <message>
+        <source>Lease Expires</source>
+        <translation>Истекува закупот</translation>
+    </message>
+    <message>
+        <source>Lease Obtained</source>
+        <translation>Земиен Закуп</translation>
+    </message>
+    <message>
+        <source>Broadcast</source>
+        <translation>Бродкаст</translation>
+    </message>
+    <message>
+        <source>MAC Address</source>
+        <translation>MAC Адреса</translation>
+    </message>
+    <message>
+        <source>00:00:00:00:00:00</source>
+        <translation>00:00:00:00:00:00</translation>
+    </message>
+</context>
+<context>
+    <name>InterfaceInformation</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Информации за интерфејс</translation>
+    </message>
+    <message>
+        <source>&amp;Refresh</source>
+        <translation>&amp;Освежи</translation>
+    </message>
+    <message>
+        <source>S&amp;top</source>
+        <translation>&amp;Стоп</translation>
+    </message>
+    <message>
+        <source>R&amp;estart</source>
+        <translation>Р&amp;естартирај</translation>
+    </message>
+    <message>
+        <source>&amp;Start</source>
+        <translation>&amp;Старт</translation>
+    </message>
+    <message>
+        <source>IP Address</source>
+        <translation>IP Адреса</translation>
+    </message>
+    <message>
+        <source>Subnet Mask</source>
+        <translation>Subnet Маска</translation>
+    </message>
+    <message>
+        <source>MAC Address</source>
+        <translation>MAC Адреса</translation>
+    </message>
+    <message>
+        <source>Broadcast</source>
+        <translation>Бродкаст</translation>
+    </message>
+    <message>
+        <source>0.0.0.0</source>
+        <translation>0.0.0.0</translation>
+    </message>
+    <message>
+        <source>00:00:00:00:00:00</source>
+        <translation>00:00:00:00:00:00</translation>
+    </message>
+    <message>
+        <source>&amp;View Advanced Information</source>
+        <translation>&amp;Види напредни информации</translation>
+    </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfaceSetup</name>
+    <message>
+        <source>Interface Configuration</source>
+        <translation>Конфигурација на интерфејс</translation>
+    </message>
+    <message>
+        <source>Automatically bring up</source>
+        <translation>Автоматско подигање</translation>
+    </message>
+    <message>
+        <source>DHCP</source>
+        <translation>DHCP</translation>
+    </message>
+    <message>
+        <source>Static Ip Configuration</source>
+        <translation>Конфигурација на статичка IP</translation>
+    </message>
+    <message>
+        <source>Subnet Mask</source>
+        <translation>Subnet Маска</translation>
+    </message>
+    <message>
+        <source>First DNS</source>
+        <translation>прв DNS</translation>
+    </message>
+    <message>
+        <source>IP Address</source>
+        <translation>IP Адреса</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Гејтвеј</translation>
+    </message>
+    <message>
+        <source>Second DNS</source>
+        <translation>Втор DNS</translation>
+    </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished">255.255.255.0</translation>
+    </message>
+</context>
+<context>
+    <name>InterfaceSetupImp</name>
+    <message>
+        <source>Restarting interface</source>
+        <translation>Рестартирање на интерфејс</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libirdaapplet.ts b/i18n/mk/libirdaapplet.ts
new file mode 100644
index 0000000..8d3ee50
--- a/dev/null
+++ b/i18n/mk/libirdaapplet.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>IrdaApplet</name>
+    <message>
+        <source>Found:</source>
+        <translation>Најдено:</translation>
+    </message>
+    <message>
+        <source>Lost:</source>
+        <translation>Изгубено:</translation>
+    </message>
+    <message>
+        <source>Discovered Device:</source>
+        <translation>Откриен Уред:</translation>
+    </message>
+    <message>
+        <source>Disable IrDA</source>
+        <translation>Исклучи IrDA</translation>
+    </message>
+    <message>
+        <source>Enable IrDA</source>
+        <translation>Вклучи IrDA</translation>
+    </message>
+    <message>
+        <source>Disable Discovery</source>
+        <translation>Исклучи откривање</translation>
+    </message>
+    <message>
+        <source>Enable Discovery</source>
+        <translation>Вклучи Откривање</translation>
+    </message>
+    <message>
+        <source>Disable Receive</source>
+        <translation>Исклучи Примање</translation>
+    </message>
+    <message>
+        <source>Enable Receive</source>
+        <translation>Вклучи Примање</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libkppp.ts b/i18n/mk/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/mk/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
new file mode 100644
index 0000000..6b24465
--- a/dev/null
+++ b/i18n/mk/libliquid.ts
@@ -0,0 +1,75 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Течен</translation>
+    </message>
+</context>
+<context>
+    <name>LiquidSettings</name>
+    <message>
+        <source>Liquid Style</source>
+        <translation type="unfinished">Течен Стил</translation>
+    </message>
+    <message>
+        <source>No translucency</source>
+        <translation type="unfinished">Без транспарентност</translation>
+    </message>
+    <message>
+        <source>Stippled, background color</source>
+        <translation type="unfinished">Боја на позадина</translation>
+    </message>
+    <message>
+        <source>Stippled, button color</source>
+        <translation type="unfinished">Боја на копчиња</translation>
+    </message>
+    <message>
+        <source>Translucent stippled, background color</source>
+        <translation type="unfinished">Прозирна боја на позадина</translation>
+    </message>
+    <message>
+        <source>Translucent stippled, button color</source>
+        <translation type="unfinished">прозирна боја на копчиња</translation>
+    </message>
+    <message>
+        <source>Custom translucency</source>
+        <translation type="unfinished">Корисничка порзирност</translation>
+    </message>
+    <message>
+        <source>Menu color</source>
+        <translation type="unfinished">Боја на менито</translation>
+    </message>
+    <message>
+        <source>Text color</source>
+        <translation type="unfinished">Боја на текст</translation>
+    </message>
+    <message>
+        <source>Opacity</source>
+        <translation type="unfinished">Прозирност</translation>
+    </message>
+    <message>
+        <source>Use shadowed menu text</source>
+        <translation type="unfinished">Користи сенки за текст на мени</translation>
+    </message>
+    <message>
+        <source>Make toolbar buttons appear flat</source>
+        <translation type="unfinished">Направи копчињата на палетата да изгледаат рамни</translation>
+    </message>
+    <message>
+        <source>Stipple contrast</source>
+        <translation type="unfinished">Контраст</translation>
+    </message>
+</context>
+<context>
+    <name>Styles</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="unfinished">Течен</translation>
+    </message>
+    <message>
+        <source>High Performance Liquid style by Mosfet</source>
+        <translation type="unfinished">Течен стил со високи перформанси од Моосфет</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/liblogoutapplet.ts b/i18n/mk/liblogoutapplet.ts
new file mode 100644
index 0000000..d31dc76
--- a/dev/null
+++ b/i18n/mk/liblogoutapplet.ts
@@ -0,0 +1,19 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LogoutApplet</name>
+    <message>
+        <source>Logout shortcut</source>
+        <translation>Кратенка за излез</translation>
+    </message>
+    <message>
+        <source>Logout</source>
+        <translation>Излези</translation>
+    </message>
+    <message>
+        <source>Do you really want to
+end this session ?</source>
+        <translation>Дали сакате
+да се заврши оваа сесија?</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libmadplugin.ts b/i18n/mk/libmadplugin.ts
new file mode 100644
index 0000000..35319fd
--- a/dev/null
+++ b/i18n/mk/libmadplugin.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LibMadPlugin</name>
+    <message>
+        <source>No Song Open</source>
+        <translation>Нема отворена песна</translation>
+    </message>
+    <message>
+        <source>Info: </source>
+        <translation>Информации:</translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Genre: </source>
+        <translation>Жанр:</translation>
+    </message>
+    <message>
+        <source>Bitrate: </source>
+        <translation>Квалитет:</translation>
+    </message>
+    <message>
+        <source>URL: </source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Наслов</translation>
+    </message>
+    <message>
+        <source>Artist</source>
+        <translation>Артист</translation>
+    </message>
+    <message>
+        <source>Album</source>
+        <translation>Албум</translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation>Година</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Коментар</translation>
+    </message>
+    <message>
+        <source>, Track: </source>
+        <translation>Песна:</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/libmail.ts b/i18n/mk/libmail.ts
index 78c7198..78c7198 100644
--- a/i18n/unmaintained/ja/libmail.ts
+++ b/i18n/mk/libmail.ts
diff --git a/i18n/mk/libmetal.ts b/i18n/mk/libmetal.ts
new file mode 100644
index 0000000..2e172a5
--- a/dev/null
+++ b/i18n/mk/libmetal.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Styles</name>
+    <message>
+        <source>Metal</source>
+        <translation>Метал</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/librestartapplet.ts b/i18n/mk/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/hu/librestartapplet.ts
+++ b/i18n/mk/libmodplugin.ts
diff --git a/i18n/mk/libnotesapplet.ts b/i18n/mk/libnotesapplet.ts
new file mode 100644
index 0000000..eae5520
--- a/dev/null
+++ b/i18n/mk/libnotesapplet.ts
@@ -0,0 +1,45 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>NotesControl</name>
+    <message>
+        <source>New</source>
+        <translation>Нова</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Delete?</source>
+        <translation>Избриши?</translation>
+    </message>
+    <message>
+        <source>Do you really want to&lt;BR&gt;&lt;B&gt; delete&lt;/B&gt; this note ?</source>
+        <translation>Сакате да ја &lt;BR&gt;&lt;B&gt;избришете&lt;/B&gt;оваа забелешка ?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Beam Out</source>
+        <translation>Испрати</translation>
+    </message>
+    <message>
+        <source>Search For...</source>
+        <translation>Барај...</translation>
+    </message>
+    <message>
+        <source>Toggle Maximized</source>
+        <translation>Зголеми</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopie.ts b/i18n/mk/libopie.ts
new file mode 100644
index 0000000..0d6aa62
--- a/dev/null
+++ b/i18n/mk/libopie.ts
@@ -0,0 +1,675 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Коче календар</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>копче контакти</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>копје мени</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>копје порака</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Копче дома</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>копче сними</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>ротирање на екран</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Подредување:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Разместување:</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Вредност:</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Црвена:</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Зелена:</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Плава:</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Алфа канал:</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Избери боја</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Повеќе</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Повеќе...</translation>
+    </message>
+</context>
+<context>
+    <name>OFileDialog</name>
+    <message>
+        <source>FileDialog</source>
+        <translation>Диалог на датотеки</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Mime Тип</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Голем</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Среден</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Мал</translation>
+    </message>
+</context>
+<context>
+    <name>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>ORecurranceBase</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>Пром1</translation>
+    </message>
+    <message>
+        <source>Var 2</source>
+        <translation>Пром2</translation>
+    </message>
+    <message>
+        <source>WeekVar</source>
+        <translation>НеделаПром</translation>
+    </message>
+</context>
+<context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Нема краен датум</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>денови</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>ден</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>недели</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>недела</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>месеци</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>месец</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>години</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>година</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>и</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+и</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, и</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Без повторување</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>денови</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Вклучи повторување</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Пон</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Втор</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Сред</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Чет</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Пет</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Саб</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Нед</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>недели</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Повторувај по</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Ден</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>датум</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>месеци</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>години</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTimePickerDialogBase</name>
+    <message>
+        <source>Time:</source>
+        <translation>Време:</translation>
+    </message>
+    <message>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+    <message>
+        <source>Pick Time:</source>
+        <translation>Одбери Време:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation>Документи</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Датотеки</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Сите пораки</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="obsolete">Опис:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Приоритет:</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Многу високо</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Висок</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Нормално</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Низок</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Многу ниско</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Напредок:</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Краен рок:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Категорија:</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>Основна E-mail адреса:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Канцеларија:</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Службена интернет страна:</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Службен Телефон:</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Службен факс:</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Службен Мобилен:</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Службен Пејџер:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Приватна Интернет страна:</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Домашен Телефон:</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Домашен Факс:</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Приватен Мобилен:</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>Сите електронски писма:</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Професија:</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Асистент:</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Менаџер:</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Машки</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Женски</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Пол:</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Сопруг/Сопруга:</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Роденден:</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Годишнина:</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Деца:</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Надимак:</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Забелешки:</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Локација:</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Ова е настан за цел ден</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Ова е настан од повеќе денови</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Старт:</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Крај:</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Забелешка:</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 секој</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>%1 секој</translation>
+    </message>
+    <message>
+        <source>The %1 %1 of every</source>
+        <translation type="obsolete">%1 %1 од секој</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Понеделник</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Вторник</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Среда</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Четврток</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Петок</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Сабота</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Недела</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished">%1 %2 од секој</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>nd</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>rd</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>th</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopieobex.ts b/i18n/mk/libopieobex.ts
new file mode 100644
index 0000000..2c4827f
--- a/dev/null
+++ b/i18n/mk/libopieobex.ts
@@ -0,0 +1,76 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OpieObex::OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;b&gt;Примено:&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Прифати</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Одбиј</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation>&lt;p&gt;Примивте датотека од тип %1 (&lt;img src=&quot;%2&quot;&gt;)Што сакате да направите?</translation>
+    </message>
+</context>
+<context>
+    <name>OpieObex::SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;h1&gt;Праќање:&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Готово</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation>IrDa не е вклучена!</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation>Барање IrDa уреди.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation>Bluetooth не е достапен</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation>Барање bluetooth уреди.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation>Закажување на испраќање.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation>Кликно да пренесеш</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation>Пратено</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation>Пробај %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation>Повторно барај IrDa.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation>Почни праќање</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libpolished.ts b/i18n/mk/libpolished.ts
new file mode 100644
index 0000000..a346797
--- a/dev/null
+++ b/i18n/mk/libpolished.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Decoration</name>
+    <message>
+        <source>Polished</source>
+        <translation>Сјајна</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqdvorak.ts b/i18n/mk/libqdvorak.ts
new file mode 100644
index 0000000..bd1dd5b
--- a/dev/null
+++ b/i18n/mk/libqdvorak.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dvorak</source>
+        <translation>Дворак</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqhandwriting.ts b/i18n/mk/libqhandwriting.ts
new file mode 100644
index 0000000..204fbfa
--- a/dev/null
+++ b/i18n/mk/libqhandwriting.ts
@@ -0,0 +1,162 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HandwritingHelp</name>
+    <message>
+        <source>Handwriting Help</source>
+        <translation>Помош на пишување</translation>
+    </message>
+    <message>
+        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
+        <translation>&lt;ul&gt;li&lt;КОга почнувате со користење на препознавањето на карактерите, прецизно и цврсто.&lt;li&gt;Користете ги линиите кога цртате карактери.&lt;li&gt;Кога цртате карактер со повеќе повлекувања, секое последователно повлекување мора да биде пред да се избришат претходните потези.&lt;il&gt;Битете трпеливи.&lt;li&gt;.Кога додавате свои карактери внимавајте тие да се доволно различни од останатите.&lt;ul&gt;</translation>
+    </message>
+    <message>
+        <source>Tips</source>
+        <translation>Финти</translation>
+    </message>
+    <message>
+        <source>Trainer</source>
+        <translation>Тренер</translation>
+    </message>
+</context>
+<context>
+    <name>HandwritingTrainer</name>
+    <message>
+        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
+        <translation>Избери соодветен карактер од листата. Вежбајте на десната страна.</translation>
+    </message>
+    <message>
+        <source>No match</source>
+        <translation>Нема исто</translation>
+    </message>
+    <message>
+        <source>Matched: </source>
+        <translation>Пронајдено:</translation>
+    </message>
+    <message>
+        <source>Similar to: </source>
+        <translation>Слично на:</translation>
+    </message>
+    <message>
+        <source>%1%</source>
+        <translation>%1%</translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Handwriting</source>
+        <translation>Рачно Пишување</translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenEdit</name>
+    <message>
+        <source>New...</source>
+        <translation>Нов...</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додаа</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Основно</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInput</name>
+    <message>
+        <source>Shortcut</source>
+        <translation>Кратенка</translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenInputCharDlg</name>
+    <message>
+        <source>Enter new character</source>
+        <translation>Внеси нов карактер</translation>
+    </message>
+    <message>
+        <source>Character:</source>
+        <translation>Карактер:</translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenPrefBase</name>
+    <message>
+        <source>Multi-stroke character timeout:</source>
+        <translation>Време за внесување на карактери од повеќе потези:</translation>
+    </message>
+    <message>
+        <source>ms</source>
+        <translation>ms</translation>
+    </message>
+    <message>
+        <source>Input areas displayed</source>
+        <translation>Прикажани се полињата за внесување</translation>
+    </message>
+    <message>
+        <source>Upper and lower case areas</source>
+        <translation>Предели за големи и мали букви</translation>
+    </message>
+    <message>
+        <source>Lower case (toggle Upper case)</source>
+        <translation>Мали букви (вклуч Големи букви)</translation>
+    </message>
+</context>
+<context>
+    <name>QIMPenSetup</name>
+    <message>
+        <source>Setup Handwriting Input</source>
+        <translation>Подеси внесување на карактери</translation>
+    </message>
+    <message>
+        <source>Character Profile:</source>
+        <translation>Профил на карактер:</translation>
+    </message>
+    <message>
+        <source>Preferences</source>
+        <translation>Својства</translation>
+    </message>
+    <message>
+        <source>Customize</source>
+        <translation>МОдифицирај</translation>
+    </message>
+    <message>
+        <source>%1 ms</source>
+        <translation>%1 ms</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Нема простор</translation>
+    </message>
+    <message>
+        <source>Unable to save information.
+Free up some space
+and try again.
+
+Quit anyway?</source>
+        <translation>Неможе да се снимат информациите
+Ослободете простор
+и обидете се повторно.
+
+Излегување?</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqjumpx.ts b/i18n/mk/libqjumpx.ts
new file mode 100644
index 0000000..3d0303c
--- a/dev/null
+++ b/i18n/mk/libqjumpx.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>JumpX</source>
+        <translation>СкокниХ</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqkeyboard.ts b/i18n/mk/libqkeyboard.ts
new file mode 100644
index 0000000..9f5d6eb
--- a/dev/null
+++ b/i18n/mk/libqkeyboard.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Keyboard</source>
+        <translation>Тастатура</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqkjumpx.ts b/i18n/mk/libqkjumpx.ts
new file mode 100644
index 0000000..8b1fdfe
--- a/dev/null
+++ b/i18n/mk/libqkjumpx.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>KJumpX</source>
+        <translation>KjumpX</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqmultikey.ts b/i18n/mk/libqmultikey.ts
new file mode 100644
index 0000000..b23e1e8
--- a/dev/null
+++ b/i18n/mk/libqmultikey.ts
@@ -0,0 +1,64 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ConfigDlg</name>
+    <message>
+        <source>Multikey Configuration</source>
+        <translation>конфигурација на тастатура</translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation>Основни подесувања</translation>
+    </message>
+    <message>
+        <source>Keymap File</source>
+        <translation>датотека на мапирање на копчиња</translation>
+    </message>
+    <message>
+        <source>Current Language</source>
+        <translation>Јазик</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додади</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+    <message>
+        <source>Pickboard</source>
+        <translation>Тастатура на избор</translation>
+    </message>
+    <message>
+        <source>Key Repeat</source>
+        <translation>повторување</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Бои</translation>
+    </message>
+    <message>
+        <source>Key Color</source>
+        <translation>боја на копчиња</translation>
+    </message>
+    <message>
+        <source>Key Pressed Color</source>
+        <translation>боја на притиснато копче</translation>
+    </message>
+    <message>
+        <source>Line Color</source>
+        <translation>боја на линија</translation>
+    </message>
+    <message>
+        <source>Text Color</source>
+        <translation>Боја н текст</translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Multikey</source>
+        <translation>Тастатура</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
new file mode 100644
index 0000000..89b24fa
--- a/dev/null
+++ b/i18n/mk/libqpe.ts
@@ -0,0 +1,956 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Categories</name>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Не е внесено</translation>
+    </message>
+    <message>
+        <source> (multi.)</source>
+        <translation>(повеќе)</translation>
+    </message>
+    <message>
+        <source>Business</source>
+        <translation>Бизнис</translation>
+    </message>
+    <message>
+        <source>Personal</source>
+        <translation>Лични</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryCombo</name>
+    <message>
+        <source> (Multi.)</source>
+        <translation>(Повеќе)</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryEdit</name>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation>Нова категорија</translation>
+    </message>
+    <message>
+        <source>New Category </source>
+        <translation>Нова категорија</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryEditBase</name>
+    <message>
+        <source>Category Edit</source>
+        <translation>Уреди Категорија</translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation>Категории</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Апликација</translation>
+    </message>
+    <message>
+        <source>Categories Go Here</source>
+        <translation>Овде идат категориите</translation>
+    </message>
+    <message>
+        <source>Check the categories this document belongs to.</source>
+        <translation>Види во кои категории спаѓа документов.</translation>
+    </message>
+    <message>
+        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
+        <translation>Внеси нова категорија. Притисни &lt;b&gt;Додај&lt;/b&gt; за да се додаде на листата.</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Enter a new category to the left and press to add it to the list.</source>
+        <translation>Внеси нова категорија лево и притисни додај за да се додаде на листата.</translation>
+    </message>
+    <message>
+        <source>Press to delete the highlighted category.</source>
+        <translation>Притисни за да сеизбрише избраната категорија.</translation>
+    </message>
+    <message>
+        <source>Global</source>
+        <translation>Глобална</translation>
+    </message>
+    <message>
+        <source>Check to make this property available to all applications.</source>
+        <translation>Избери за ова својство да биде достапно на сите апликации.</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryMenu</name>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Не е внесено</translation>
+    </message>
+</context>
+<context>
+    <name>CategorySelect</name>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Sorry, another application is
+editing categories.</source>
+        <translation>Друга апликација ги 
+уредува категориите.</translation>
+    </message>
+    <message>
+        <source>Edit Categories</source>
+        <translation>Уреди категории</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookMonthHeader</name>
+    <message>
+        <source>Show January in the selected year</source>
+        <translation>Прикажи го Јануари во избраната година</translation>
+    </message>
+    <message>
+        <source>Show the previous month</source>
+        <translation>Прикажи го претходниот месец</translation>
+    </message>
+    <message>
+        <source>Show the next month</source>
+        <translation>Прикажи го следниот месец</translation>
+    </message>
+    <message>
+        <source>Show December in the selected year</source>
+        <translation>Прикаѓи го Декември во избраната година</translation>
+    </message>
+</context>
+<context>
+    <name>FileSelector</name>
+    <message>
+        <source>Close the File Selector</source>
+        <translation>Затвори го избирачот на датотеки</translation>
+    </message>
+    <message>
+        <source>Show documents of this type</source>
+        <translation>Прикажи ги документите од овој тип</translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation>Преглед на документи</translation>
+    </message>
+    <message>
+        <source>Show documents in this category</source>
+        <translation>Прикажи ги документите во оваа категорија</translation>
+    </message>
+    <message>
+        <source>Click to select a document from the list</source>
+        <translation>Кликни за да избереш документ од листата</translation>
+    </message>
+    <message>
+        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
+        <translation>, или избери &lt;b&gt;Нов Документ&lt;/b&gt; за да се креира нов документ.</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
+        <translation>&lt;br&gt;&lt;br&gt;Кликни и држи за својства на докуументот.</translation>
+    </message>
+</context>
+<context>
+    <name>FileSelectorView</name>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>Find</source>
+        <translation>Пронајди</translation>
+    </message>
+</context>
+<context>
+    <name>FindWidget</name>
+    <message>
+        <source>String Not Found.</source>
+        <translation>Стригот не е пронајден.</translation>
+    </message>
+    <message>
+        <source>End reached, starting at beginning</source>
+        <translation>Стигнав до крајк, повторно почнувам од почеток</translation>
+    </message>
+</context>
+<context>
+    <name>FindWidgetBase</name>
+    <message>
+        <source>Find</source>
+        <translation>Пронајди</translation>
+    </message>
+    <message>
+        <source>Find what:</source>
+        <translation>Барај:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Категрија:</translation>
+    </message>
+    <message>
+        <source>Start Search at:</source>
+        <translation>Почни со пребарување на:</translation>
+    </message>
+    <message>
+        <source>Dec 02 01</source>
+        <translation>Дек 02 01</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>Внимавај на големина на карактери</translation>
+    </message>
+    <message>
+        <source>Search Backwards</source>
+        <translation>Барај наназад</translation>
+    </message>
+</context>
+<context>
+    <name>LnkProperties</name>
+    <message>
+        <source>Properties</source>
+        <translation>Својства</translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation>Преглед на документи</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>File deletion failed.</source>
+        <translation>Бришењето на датотеката неуспеа.</translation>
+    </message>
+    <message>
+        <source>Hard Disk</source>
+        <translation>Тврд Диск</translation>
+    </message>
+    <message>
+        <source>Copy of </source>
+        <translation>Копија на</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation>Дупликат</translation>
+    </message>
+    <message>
+        <source>File copy failed.</source>
+        <translation>Неуспешно копирање.</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Детали</translation>
+    </message>
+    <message>
+        <source>Moving Document failed.</source>
+        <translation>Поместувањето на документот неуспеа.</translation>
+    </message>
+</context>
+<context>
+    <name>LnkPropertiesBase</name>
+    <message>
+        <source>Details</source>
+        <translation>Детали</translation>
+    </message>
+    <message>
+        <source>Use custom rotation</source>
+        <translation>Користи сопствена ротација</translation>
+    </message>
+    <message>
+        <source>Preload this application so that it is available instantly.</source>
+        <translation>Однапред вчитај ја апликацијава, за да биде веднаш достапна.</translation>
+    </message>
+    <message>
+        <source>The name of this document.</source>
+        <translation>Името на овој документ.</translation>
+    </message>
+    <message>
+        <source>The media the document resides on.</source>
+        <translation>Медимуот на кој е сместен документот.</translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Локација:</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Fast load (consumes memory)</source>
+        <translation>Брззо вчитување (одзема меморија)</translation>
+    </message>
+    <message>
+        <source>Comment:</source>
+        <translation>Коментар:</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Delete this document.</source>
+        <translation>Избриши го документов.</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копирај</translation>
+    </message>
+    <message>
+        <source>Make a copy of this document.</source>
+        <translation>Направи копија на документов.</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation>Пренеси</translation>
+    </message>
+    <message>
+        <source>Beam this document to another device.</source>
+        <translation>Пренеси го документов на друг уред.</translation>
+    </message>
+</context>
+<context>
+    <name>OwnerDlg</name>
+    <message>
+        <source>Owner Information</source>
+        <translation>Информации за сопственикот</translation>
+    </message>
+</context>
+<context>
+    <name>PasswordBase</name>
+    <message>
+        <source>1</source>
+        <translation>1</translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation>2</translation>
+    </message>
+    <message>
+        <source>3</source>
+        <translation>3</translation>
+    </message>
+    <message>
+        <source>4</source>
+        <translation>4</translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation>6</translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation>7</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>9</source>
+        <translation>9</translation>
+    </message>
+    <message>
+        <source>0</source>
+        <translation>0</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation>Внеси лозинка</translation>
+    </message>
+</context>
+<context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>New Document</source>
+        <translation>Нов Документ</translation>
+    </message>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Кликни за да го затвориш овој прозорец.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Кликни за да можеш да го поместуваш прозорецов.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Кликни за проорецот да ја покрие целата површина на екранот.</translation>
+    </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Ot&gt;Нема детална  помош за оваа апликација&lt;p&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Што е ова...</translation>
+    </message>
+    <message>
+        <source>Out of Space</source>
+        <translation>Нема доволно простор</translation>
+    </message>
+    <message>
+        <source>There was a problem creating
+Configuration Information 
+for this program.
+
+Please free up some space and
+try again.</source>
+        <translation>Имаше проблем при креирањето на 
+конфигурациските информации
+за овој програм.
+
+Ослободете простор и
+обидете се повторно.</translation>
+    </message>
+    <message>
+        <source>Unable to create start up files
+Please free up some space
+before entering data</source>
+        <translation>Неможе да се креираат стартните датотеки
+Ослободете простор 
+пред да внесувате податоци</translation>
+    </message>
+    <message>
+        <source>Unable to schedule alarm.
+Free some memory and try again.</source>
+        <translation>Неможе да се намести алармот.
+Ослободете меморија и обидете се повторно.</translation>
+    </message>
+    <message>
+        <source>D</source>
+        <translation>Д</translation>
+    </message>
+    <message>
+        <source>M</source>
+        <translation>М</translation>
+    </message>
+    <message>
+        <source>Y</source>
+        <translation>Г</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>ден</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>месец</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>година</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>ПМ</translation>
+    </message>
+    <message>
+        <source>AM</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>Are you sure you want to delete
+ %1?</source>
+        <translation type="obsolete">Дали сакате да го избришете 
+%1?</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Не е внесено</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Email Addresses: </source>
+        <translation>E-mail адреса:</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Домашен Телефон:</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Домашен Факс:</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Приватен Мовилен:</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Приватна интернет страна:</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Службена интернет страна:</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Канцеларија:</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Службен телефон:</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Службен факс:</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Службен мобилен:</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Службен Пејџер:</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Професија:</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Асистент:</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Раководител:</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Маж</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Жена</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Пол:</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Споруг/Сопруга:</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Роденден:</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Годишнина:</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Надимак:</translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation>Титула</translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation>Средно Име</translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation>Презиме</translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation>Суфикс</translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation>Сними како</translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation>Работно место</translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation>Одделение</translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation>Фирма</translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation>Службен телефон</translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation>Службен факс</translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation>Службен мобилен</translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation>Основна E-mail адреса</translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation>Е-mail адреси</translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation>Домашен Телефон</translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation>Домашен Факс</translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation>Приватен Мовилен</translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation>Улица на фирмата</translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation>Град на фирмата</translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation>Држава на фирмата</translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation>Поштенски код на фирмата</translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation>Држава на фирмата</translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation>Службен пејџер</translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation>Службена интернет страна</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Канцеларија</translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation>Професија</translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation>Асистент</translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation>Раководител</translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation>Домашна улица</translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation>Домашен град</translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation>Домашна држава</translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation>Домашен поштенски број</translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation>Домажна држава</translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation>Приватна интернет страна</translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation>Споруг/Сопруга</translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation>Пол</translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation>Роденден</translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation>Годишнина</translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation>Надимак</translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation>Деца</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Забелешки</translation>
+    </message>
+    <message>
+        <source>Groups</source>
+        <translation>Групи</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 документ</translation>
+    </message>
+</context>
+<context>
+    <name>StorageInfo</name>
+    <message>
+        <source>CF Card</source>
+        <translation>CF картичка</translation>
+    </message>
+    <message>
+        <source>Hard Disk</source>
+        <translation>Тврд диск</translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation>SD картичка</translation>
+    </message>
+    <message>
+        <source>MMC Card</source>
+        <translation>MMC картичка</translation>
+    </message>
+    <message>
+        <source>SCSI Hard Disk</source>
+        <translation>SCSI тврд диск</translation>
+    </message>
+    <message>
+        <source>Internal Memory</source>
+        <translation>Внатрешна меморија</translation>
+    </message>
+    <message>
+        <source>Internal Storage</source>
+        <translation>Внатрешен медиум</translation>
+    </message>
+</context>
+<context>
+    <name>TZCombo</name>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+</context>
+<context>
+    <name>TimeZoneSelector</name>
+    <message>
+        <source>citytime executable not found</source>
+        <translation>Извршната датотека „време на град“ не е пронајдена</translation>
+    </message>
+    <message>
+        <source>In order to choose the time zones,
+please install citytime.</source>
+        <translation>За да ги одберете временските зони,
+инсталирајте го „време на град“.</translation>
+    </message>
+</context>
+<context>
+    <name>TimerReceiverObject</name>
+    <message>
+        <source>Out of Space</source>
+        <translation>Нема доволно простор</translation>
+    </message>
+    <message>
+        <source>Unable to schedule alarm.
+Please free up space and try again</source>
+        <translation>Неможе да се намести алармот.
+Ослободете меморија и обидете се повторно</translation>
+    </message>
+</context>
+<context>
+    <name>TypeCombo</name>
+    <message>
+        <source>%1 files</source>
+        <translation>%1 датотеки</translation>
+    </message>
+    <message>
+        <source>%1 %2</source>
+        <comment>minor mimetype / major mimetype</comment>
+        <translation>%1 %2</translation>
+    </message>
+    <message>
+        <source>All %1 files</source>
+        <translation>Сите %1 датотеки</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Сите датотеки</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqpickboard.ts b/i18n/mk/libqpickboard.ts
new file mode 100644
index 0000000..2cc9f99
--- a/dev/null
+++ b/i18n/mk/libqpickboard.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Pickboard</source>
+        <translation>Избирачка тастатура</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqunikeyboard.ts b/i18n/mk/libqunikeyboard.ts
new file mode 100644
index 0000000..f66852a
--- a/dev/null
+++ b/i18n/mk/libqunikeyboard.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation>Јуникод</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/librotateapplet.ts b/i18n/mk/librotateapplet.ts
new file mode 100644
index 0000000..255e224
--- a/dev/null
+++ b/i18n/mk/librotateapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>RotateApplet</name>
+    <message>
+        <source>Rotate shortcut</source>
+        <translation>Кратенка за ротирање</translation>
+    </message>
+    <message>
+        <source>Rotate</source>
+        <translation>Ротирај</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libscreenshotapplet.ts b/i18n/mk/libscreenshotapplet.ts
new file mode 100644
index 0000000..b135d74
--- a/dev/null
+++ b/i18n/mk/libscreenshotapplet.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ScreenshotControl</name>
+    <message>
+        <source>Delay</source>
+        <translation>Доцнење</translation>
+    </message>
+    <message>
+        <source>sec</source>
+        <translation>секунди</translation>
+    </message>
+    <message>
+        <source>Save named</source>
+        <translation>Сними именувано</translation>
+    </message>
+    <message>
+        <source>Save screenshot as...</source>
+        <translation>Сними слика како...</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Scap</source>
+        <translation>Намали</translation>
+    </message>
+    <message>
+        <source>Name of screenshot </source>
+        <translation>Име на слика</translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation>Успех</translation>
+    </message>
+    <message>
+        <source>Screenshot was uploaded to %1</source>
+        <translation>Сликата е снимена на %1</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Connection to %1 failed.</source>
+        <translation>Поврзувањето со %1 неуспеа.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libsuspendapplet.ts b/i18n/mk/libsuspendapplet.ts
new file mode 100644
index 0000000..b942450
--- a/dev/null
+++ b/i18n/mk/libsuspendapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SuspendApplet</name>
+    <message>
+        <source>Suspend shortcut</source>
+        <translation>Кратенка за суспендирање</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation>Супендирај</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtheme.ts b/i18n/mk/libtheme.ts
new file mode 100644
index 0000000..1688db0
--- a/dev/null
+++ b/i18n/mk/libtheme.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Styles</name>
+    <message>
+        <source>Themed style</source>
+        <translation>Стил со теми</translation>
+    </message>
+    <message>
+        <source>KDE2 theme compatible style engine</source>
+        <translation>Тема компатабилна со КДЕ2 стил</translation>
+    </message>
+</context>
+<context>
+    <name>ThemeSettings</name>
+    <message>
+        <source>Theme Style</source>
+        <translation>Тема на стил</translation>
+    </message>
+    <message>
+        <source>Select the theme to be used</source>
+        <translation>Избери ја темата</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <source>[No theme]</source>
+        <translation>нема тема</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtinykate.ts b/i18n/mk/libtinykate.ts
new file mode 100644
index 0000000..22eedb2
--- a/dev/null
+++ b/i18n/mk/libtinykate.ts
@@ -0,0 +1,22 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Out of Space</source>
+        <translation>Нема доволно простор</translation>
+    </message>
+    <message>
+        <source>There was a problem creating
+KateConfiguration Information 
+for this program.
+
+Please free up some space and
+try again.</source>
+        <translation>Имаше проблем при креирање на
+конфигурациските информации за 
+оваа програма
+
+ослободете малку простор и обидете се повторно.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
new file mode 100644
index 0000000..a7f820d
--- a/dev/null
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -0,0 +1,94 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AddressBookPluginConfig</name>
+    <message>
+        <source>Max Lines: </source>
+        <translation>Максимален бр. на линии:</translation>
+    </message>
+    <message>
+        <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
+        <translation>Подесете го максималниот бр. на линии кои ќе се покажуваат за секоја годишнина/роденден</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars: </source>
+        <translation>Скрати линија по Х карактери:</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>После колку карактери информацијата за настанот би требало да биде скратена</translation>
+    </message>
+    <message>
+        <source>Days look ahead: </source>
+        <translation>Денови за гледање напред:</translation>
+    </message>
+    <message>
+        <source>How many days we should search forward</source>
+        <translation>Колку денови напред во месецот треба да се изврши пребарување</translation>
+    </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="obsolete">За да се активираат промените: Рестартирај ја апликацијата!</translation>
+    </message>
+    <message>
+        <source>Set Headline Color: </source>
+        <translation>Намести боја на наслов:</translation>
+    </message>
+    <message>
+        <source>Colors for the headlines !</source>
+        <translation>Бои за насловите!</translation>
+    </message>
+    <message>
+        <source>Set Entry Color: </source>
+        <translation>Намести боја за настан:</translation>
+    </message>
+    <message>
+        <source>This color will be used for shown birthdays/anniversaries !</source>
+        <translation>Оваа боја ке се користи за да ги прикажува родендените/годишнините!</translation>
+    </message>
+    <message>
+        <source>Set Urgent
+Color if below </source>
+        <translation>Намести боја за 
+итно ако е под</translation>
+    </message>
+    <message>
+        <source> days: </source>
+        <translation>денови:</translation>
+    </message>
+    <message>
+        <source>This urgent color will be used if we are close to the event !</source>
+        <translation>Оваа боја ќе се користи ако настанот наближува!</translation>
+    </message>
+    <message>
+        <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
+        <translation>Оваа боја ќе се користи ако роденденот/годишнијната е поблиски од дадениот број на денови!</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation>Додаток Адресар</translation>
+    </message>
+    <message>
+        <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
+        <translation>Следниот роденден е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
+    </message>
+    <message>
+        <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
+        <translation>Нема родендени во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
+    </message>
+    <message>
+        <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
+        <translation>Следната годишнина е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
+    </message>
+    <message>
+        <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
+        <translation>Нема годишнини во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
+    </message>
+    <message>
+        <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
+        <translation>Базата на податоци не го овозможува ова пребарување! Надградете ги libOpie библиотеките! &lt;br&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
new file mode 100644
index 0000000..afa4c98
--- a/dev/null
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -0,0 +1,146 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DateBookEvent</name>
+    <message>
+        <source>[with alarm]</source>
+        <translation>[со аларм]</translation>
+    </message>
+    <message>
+        <source>note</source>
+        <translation>Забелешка</translation>
+    </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfig</name>
+    <message>
+        <source>Show location</source>
+        <translation type="obsolete">Прикажи локација</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation type="obsolete">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation type="obsolete">Прилажи забелешки</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation type="obsolete">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
+    </message>
+    <message>
+        <source>Show only later
+ appointments</source>
+        <translation type="obsolete">Прикажи ги само 
+последните состаноци</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation type="obsolete">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
+    </message>
+    <message>
+        <source>How many 
+appointment
+should be 
+shown?</source>
+        <translation type="obsolete">Кокли
+состаноци
+треба да бидат
+прикажани?</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation type="obsolete">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation type="obsolete">Уште колку денови</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation type="obsolete">Колку денови треба да бидат во опсегот</translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="obsolete">денови</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">само денес</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation type="unfinished">Прикажи локација</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation type="unfinished">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation type="unfinished">Прилажи забелешки</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation type="unfinished">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation type="unfinished">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation type="unfinished">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="unfinished">само денес</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation type="unfinished">Колку денови треба да бидат во опсегот</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation type="unfinished">Уште колку денови</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Datebook plugin</source>
+        <translation>Додаток роковник</translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
+        <translation>Денеска нема повеќе сеостаноци </translation>
+    </message>
+    <message>
+        <source>No appointments today</source>
+        <translation>Денеска нема состаноци</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodayfortuneplugin.ts b/i18n/mk/libtodayfortuneplugin.ts
new file mode 100644
index 0000000..df48fbb
--- a/dev/null
+++ b/i18n/mk/libtodayfortuneplugin.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Fortune plugin</source>
+        <translation>Додаток за среќа</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodaymailplugin.ts b/i18n/mk/libtodaymailplugin.ts
new file mode 100644
index 0000000..27dc0fe
--- a/dev/null
+++ b/i18n/mk/libtodaymailplugin.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Mail plugin</source>
+        <translation>Додаток за електронска пошта</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
+        <translation>&lt;b&gt;%1&lt;/b&gt;нова пошта,&lt;s&gt;%2&lt;/b&gt;излезни</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodaystocktickerplugin.ts b/i18n/mk/libtodaystocktickerplugin.ts
new file mode 100644
index 0000000..adfb917
--- a/dev/null
+++ b/i18n/mk/libtodaystocktickerplugin.ts
@@ -0,0 +1,101 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>StockTicker plugin</source>
+        <translation>Додаток за берза</translation>
+    </message>
+</context>
+<context>
+    <name>StockTickerPluginWidget</name>
+    <message>
+        <source>Connection refused.</source>
+        <translation>Поврзувањето е одбиено.</translation>
+    </message>
+    <message>
+        <source>Could not find server.</source>
+        <translation>Неможе да се пронајде серверот.</translation>
+    </message>
+    <message>
+        <source>Socket read error.</source>
+        <translation>Грешка во сокетот.</translation>
+    </message>
+</context>
+<context>
+    <name>StocktickerPluginConfig</name>
+    <message>
+        <source>Enter stock symbols seperated
+by a space.</source>
+        <translation>Внеси ги сумболите за акции оделени со 
+празно место.</translation>
+    </message>
+    <message>
+        <source>Toggles Time of current price field</source>
+        <translation>Поставува и време на полето за моменталната цена</translation>
+    </message>
+    <message>
+        <source>Toggles date field</source>
+        <translation>Поставува датум</translation>
+    </message>
+    <message>
+        <source>Toggles Symbol field</source>
+        <translation>Поставува симбол</translation>
+    </message>
+    <message>
+        <source>Toggles Name of symbols owner field</source>
+        <translation>Поставува Име на сопственикот на симболот</translation>
+    </message>
+    <message>
+        <source>Toggles current Price field</source>
+        <translation>Го вклучува полето за моментална цена</translation>
+    </message>
+    <message>
+        <source>Toggles last price field</source>
+        <translation>Го вклучуваа полето за последната цена</translation>
+    </message>
+    <message>
+        <source>Toggles opening price field</source>
+        <translation>Го вклучува полето за почетната цена</translation>
+    </message>
+    <message>
+        <source>Toggles minimum daily price field</source>
+        <translation>Го вклучува полето за минималната дневна цена</translation>
+    </message>
+    <message>
+        <source>Toggles maximum daily price field</source>
+        <translation>Го вклучува полето за максималната дневна цена</translation>
+    </message>
+    <message>
+        <source>Toggles daily variation of price field</source>
+        <translation>Го вклучува полето за дневните вариации на цени</translation>
+    </message>
+    <message>
+        <source>Toggles volume of trading field</source>
+        <translation>ГО вклучува полето за бројот на трансакции</translation>
+    </message>
+    <message>
+        <source>How often stocks prices should be looked up. In minutes</source>
+        <translation>Колку често треба да се освежуваат цените на акциите. Во минути</translation>
+    </message>
+    <message>
+        <source>Minutes between lookups.</source>
+        <translation>Минути помеѓу две освежувања.</translation>
+    </message>
+    <message>
+        <source>Speed of scrolling action, in milliseconds</source>
+        <translation>Брзина на поместивање, во милисекунди</translation>
+    </message>
+    <message>
+        <source>Scroll Speed, in milliseconds</source>
+        <translation>Брзина на поместивање, во милисекунди</translation>
+    </message>
+    <message>
+        <source>Length of scrolling</source>
+        <translation>Должина на поместување</translation>
+    </message>
+    <message>
+        <source>Scroll Length</source>
+        <translation>Должина на поместување</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodaytodolistplugin.ts b/i18n/mk/libtodaytodolistplugin.ts
new file mode 100644
index 0000000..c7bd99d
--- a/dev/null
+++ b/i18n/mk/libtodaytodolistplugin.ts
@@ -0,0 +1,59 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Todolist plugin</source>
+        <translation>додаток листа на задачи</translation>
+    </message>
+    <message>
+        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
+        <translation>Има &lt;b&gt;1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
+        <translation>Има &lt;b&gt;%1&lt;/b&gt;активни задачи: &lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>No active tasks</source>
+        <translation>Нема активни задачи</translation>
+    </message>
+</context>
+<context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation type="unfinished">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation type="unfinished">После колку карактери информацијата треба да се скрати</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished">Скрати ја линијата по Х карактеро</translation>
+    </message>
+</context>
+<context>
+    <name>TodolistPluginConfig</name>
+    <message>
+        <source>tasks shown </source>
+        <translation type="obsolete">Прикажани задачи</translation>
+    </message>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation type="obsolete">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="obsolete">Скрати ја линијата по Х карактеро</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation type="obsolete">После колку карактери информацијата треба да се скрати</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libtodayweatherplugin.ts b/i18n/mk/libtodayweatherplugin.ts
new file mode 100644
index 0000000..0840f64
--- a/dev/null
+++ b/i18n/mk/libtodayweatherplugin.ts
@@ -0,0 +1,117 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Weather plugin</source>
+        <translation>Додаток за време</translation>
+    </message>
+</context>
+<context>
+    <name>WeatherPluginConfig</name>
+    <message>
+        <source>Enter ICAO location identifier:</source>
+        <translation>Внеси идентификатор за локација:</translation>
+    </message>
+    <message>
+        <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
+        <translation>Внеси код од 4 букви за локацијата. Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да најдете локација блиску до вас.</translation>
+    </message>
+    <message>
+        <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
+        <translation>Погледајте на http://www.nws.noaa.gov/siteloc.shtml за да ја пронајдете најблиската локација.</translation>
+    </message>
+    <message>
+        <source>Use metric units</source>
+        <translation>Користи метрични единици</translation>
+    </message>
+    <message>
+        <source>Click here to select type of units displayed.</source>
+        <translation>Клики овде за да се избере типот на мерни единици.</translation>
+    </message>
+    <message>
+        <source>Update frequency (in minutes):</source>
+        <translation>Фрекфенција на освежување (во минути):</translation>
+    </message>
+    <message>
+        <source>Select how often (in minutes) you want the weather to be updated.</source>
+        <translation>Одберете колку често (во минути) податоците за времето да се освежуваат.</translation>
+    </message>
+</context>
+<context>
+    <name>WeatherPluginWidget</name>
+    <message>
+        <source>Retreiving current weather information.</source>
+        <translation>Вчитување на информациите за моменталната состојба.</translation>
+    </message>
+    <message>
+        <source>Temp: </source>
+        <translation>Температура:</translation>
+    </message>
+    <message>
+        <source>  Wind: </source>
+        <translation>Ветер:</translation>
+    </message>
+    <message>
+        <source>
+Pres: </source>
+        <translation>
+Притисок:</translation>
+    </message>
+    <message>
+        <source>Current weather data not available.</source>
+        <translation>Податоците за моменталната состојба не се достапни.</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>н/а</translation>
+    </message>
+    <message>
+        <source>E </source>
+        <translation>И</translation>
+    </message>
+    <message>
+        <source>NE </source>
+        <translation>СИ</translation>
+    </message>
+    <message>
+        <source>N </source>
+        <translation>С</translation>
+    </message>
+    <message>
+        <source>NW </source>
+        <translation>СЗ</translation>
+    </message>
+    <message>
+        <source>W </source>
+        <translation>З</translation>
+    </message>
+    <message>
+        <source>SW </source>
+        <translation>ЈЗ</translation>
+    </message>
+    <message>
+        <source>S </source>
+        <translation>Ј</translation>
+    </message>
+    <message>
+        <source>SE </source>
+        <translation>ЈИ</translation>
+    </message>
+    <message>
+        <source> KPH</source>
+        <translation>Км/Ч</translation>
+    </message>
+    <message>
+        <source> MPH</source>
+        <translation>М/ч</translation>
+    </message>
+    <message>
+        <source> hPa</source>
+        <translation>хПа</translation>
+    </message>
+    <message>
+        <source> Hg</source>
+        <translation>Hg</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/sfcave-sdl.ts b/i18n/mk/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/hu/sfcave-sdl.ts
+++ b/i18n/mk/libtremorplugin.ts
diff --git a/i18n/mk/libvmemoapplet.ts b/i18n/mk/libvmemoapplet.ts
new file mode 100644
index 0000000..152214a
--- a/dev/null
+++ b/i18n/mk/libvmemoapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation>Забелешка</translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation>Грешка при снимањето</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libvolumeapplet.ts b/i18n/mk/libvolumeapplet.ts
new file mode 100644
index 0000000..20e4225
--- a/dev/null
+++ b/i18n/mk/libvolumeapplet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VolumeControl</name>
+    <message>
+        <source>Enable Sounds for:</source>
+        <translation>Вклучи звуци за:</translation>
+    </message>
+    <message>
+        <source>Screen Taps</source>
+        <translation>Кликови на екран</translation>
+    </message>
+    <message>
+        <source>Key Clicks</source>
+        <translation>Кликови на копчиња</translation>
+    </message>
+    <message>
+        <source>Alarm Sound</source>
+        <translation>Звук на аларм</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ko/libwavplugin.ts b/i18n/mk/libwavplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ko/libwavplugin.ts
+++ b/i18n/mk/libwavplugin.ts
diff --git a/i18n/mk/libwirelessapplet.ts b/i18n/mk/libwirelessapplet.ts
new file mode 100644
index 0000000..f707061
--- a/dev/null
+++ b/i18n/mk/libwirelessapplet.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AdvancedConfigBase</name>
+    <message>
+        <source>Advanced Config</source>
+        <translation>Напредна Конфигурација</translation>
+    </message>
+    <message>
+        <source>Renew DHCP on changing</source>
+        <translation>Обнови DHCP на промена</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation>Фрекфенција</translation>
+    </message>
+    <message>
+        <source>MODE</source>
+        <translation>МОД</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>AccessPoint</source>
+        <translation>Точка на поврзување</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/mk/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libwlanplugin.ts b/i18n/mk/libwlanplugin.ts
new file mode 100644
index 0000000..ca66661
--- a/dev/null
+++ b/i18n/mk/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Безжична конфигурација</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Општо</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Мод</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Специфицирај &amp;Точка на поврзување</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Специфицирај &amp;Канал</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Автоматски</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Управувано</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Веднаш</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>секој</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Енкрипција</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Овозможи Енкрипција</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Подесувања на клучеви</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Клуч &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Клуч &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Клуч &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Клуч &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Не-Енкриптирани паќети</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Прими</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Одбиј</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Информации за интерфејсот</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Канал</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Мод</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Станица</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Брзина</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Квалитат</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Шум</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Сигнал</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/light-and-power.ts b/i18n/mk/light-and-power.ts
new file mode 100644
index 0000000..60281d0
--- a/dev/null
+++ b/i18n/mk/light-and-power.ts
@@ -0,0 +1,151 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibration</name>
+    <message>
+        <source>%1 Steps</source>
+        <translation>%1 Чекори</translation>
+    </message>
+</context>
+<context>
+    <name>LightSettingsBase</name>
+    <message>
+        <source>Light and Power Settings</source>
+        <translation>Подесувања за светлото и енергијата</translation>
+    </message>
+    <message>
+        <source>on Battery</source>
+        <translation>на Батерија</translation>
+    </message>
+    <message>
+        <source>General Settings</source>
+        <translation>Оснопвни подесувања</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>сек</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>нокогаш</translation>
+    </message>
+    <message>
+        <source>Light off after</source>
+        <translation>Изгасисветло по</translation>
+    </message>
+    <message>
+        <source>Dim light after</source>
+        <translation>Намали светло по</translation>
+    </message>
+    <message>
+        <source>Suspend after</source>
+        <translation>Супендирај по</translation>
+    </message>
+    <message>
+        <source>Deactivate LCD only (does not suspend)</source>
+        <translation>Деактивирај ЛЦД екран (не суспендира)</translation>
+    </message>
+    <message>
+        <source>Backlight</source>
+        <translation>Светло</translation>
+    </message>
+    <message>
+        <source>set a fix value for backlight</source>
+        <translation>постави фиксна вредност за светлото</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Исклучи</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Целосно</translation>
+    </message>
+    <message>
+        <source>Use Light Sensor</source>
+        <translation>Користи Сензор за Светло</translation>
+    </message>
+    <message>
+        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
+        <translation>Светлото на екранот може автоматски да се подесува во заивснот од светлината околу вас. ПОдесувањата за светлост сеуште влијаат на просечното осветлување.</translation>
+    </message>
+    <message>
+        <source>Calibrate</source>
+        <translation>Калибрирај</translation>
+    </message>
+    <message>
+        <source>Advanced settings for light sensor handling</source>
+        <translation>Напредни подесувања за управување со светлосниот сензор</translation>
+    </message>
+    <message>
+        <source>on AC</source>
+        <translation>на Мрежа</translation>
+    </message>
+    <message>
+        <source>Warnings</source>
+        <translation>Предупредувања</translation>
+    </message>
+    <message>
+        <source>Low power warning interval</source>
+        <translation>Интервал за предупредување на слаба батерија</translation>
+    </message>
+    <message>
+        <source> %</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <source>At what battery level should the low power warning pop up</source>
+        <translation>На кое ниво набатеријата треба предупредувањето да се појави</translation>
+    </message>
+    <message>
+        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
+        <translation>Колку често треба да се проверува за нивото на батеријата. Ова одредува колку често ќе има известувања за ситуации со слаба батерија </translation>
+    </message>
+    <message>
+        <source>At what battery level should the critical power warning pop up</source>
+        <translation>На кое ниво на батеријата треба да се појави критичното предупредување</translation>
+    </message>
+    <message>
+        <source>very low battery warning at</source>
+        <translation>предупредување за многу ниско ниво на батерија</translation>
+    </message>
+    <message>
+        <source>critical power warning at</source>
+        <translation>предупредување за критично ниво на батерија</translation>
+    </message>
+</context>
+<context>
+    <name>SensorBase</name>
+    <message>
+        <source>Sensor Calibration</source>
+        <translation>Шпдесување на сензор</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Целосно</translation>
+    </message>
+    <message>
+        <source>Off</source>
+        <translation>Исклучи</translation>
+    </message>
+    <message>
+        <source>Dark</source>
+        <translation>Темно</translation>
+    </message>
+    <message>
+        <source>Light</source>
+        <translation>Светло</translation>
+    </message>
+    <message>
+        <source>Steps</source>
+        <translation>Чекори</translation>
+    </message>
+    <message>
+        <source>Check interval</source>
+        <translation>Интервал на проверка</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>сек</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/mail.ts b/i18n/mk/mail.ts
index d251908..d251908 100644
--- a/i18n/unmaintained/ja/mail.ts
+++ b/i18n/mk/mail.ts
diff --git a/i18n/mk/mailit.ts b/i18n/mk/mailit.ts
new file mode 100644
index 0000000..4e9462e
--- a/dev/null
+++ b/i18n/mk/mailit.ts
@@ -0,0 +1,605 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AddAtt</name>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>attach...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attached</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditAccount</name>
+    <message>
+        <source>Edit Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POP username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POP password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>POP server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMTP server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Synchronize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Size (k)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EmailClient</name>
+    <message>
+        <source>Main operation toolbar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get Mail in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>getMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>select account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to download mail via all available accounts.
+ Press and hold to select the desired account.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compose</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subject</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Idle</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must create an account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account associated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is no active account 
+associated to this mail
+ it can not be downloaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EmailHandler</name>
+    <message>
+        <source>Could not locate all files in 
+mail with subject: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Mail has NOT been sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attachment error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MailItWindow</name>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Central view area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Write mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail not downloaded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail you have clicked 
+has not been downloaded yet.
+ Would you like to do it now ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PopClient</name>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Occured</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Retrieving </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completing message </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No new Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> new messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No new messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>This is the inbox view.
+It keeps the fetched mail which can be 
+viewed by double clicking the entry.
+blue attachment icon shows whether this 
+mailhas attachments.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the outbox view.
+It keeps the queued mails to send which can be 
+reviewed by double clicking the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail subject should be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recipients can be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you would like to send copies of your mail they can be entered here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your mail text here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose the recipients from this list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Queue your mail by clicking here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an overview about all attachments in the mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ReadMail</name>
+    <message>
+        <source>&amp;View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to download the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read the previous mail in the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read the next mail in the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add attachments to your mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The mail view has 2 modes:
+&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>reply to mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail
+Press and hold for more options.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reply all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reply to the selected mail to CC: addresses also</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to forward the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the selected mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SmtpClient</name>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ViewAtt</name>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to install the attachment to your Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WriteMail</name>
+    <message>
+        <source>&amp;Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to attach files to your mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enque mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button puts your mail in the send queue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CC:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subject:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send mail to whom?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect recipient separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recipients must be separated by ;
+and be valid emailaddresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect carbon copy separator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CC Recipients must be separated by ;
+and be valid emailaddresses</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> wrote on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>======forwarded message from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> starts======
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FWD: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>======end of forwarded message======
+
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/mediummount.ts b/i18n/mk/mediummount.ts
new file mode 100644
index 0000000..381fcd2
--- a/dev/null
+++ b/i18n/mk/mediummount.ts
@@ -0,0 +1,95 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MediumMountSetting::MainWindow</name>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation>Подесувања за прикачување на медии</translation>
+    </message>
+    <message>
+        <source>Global</source>
+        <translation>Глобални</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Доколку внесете медиум во уредот Opie се обидува да го пребара медиумот за документи. На големи медиуми ова може да одземе многу време. Може да се избере дали Opie треба глобално да пребарува за документи или по ниво на медиум. Исто така може да се реконфигурира за секој медиум.</translation>
+    </message>
+    <message>
+        <source>Enable medium checking</source>
+        <translation>Вклучи проверка на медиум</translation>
+    </message>
+    <message>
+        <source>Use global settings</source>
+        <translation>Користи глобални подесувања</translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation>Кои датотеки</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Слики</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Видео</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Кквигурирај го овој медиум. Променте ќе земат ефект кога ќе се затвори апликацијата. За да се освежи кјазичето Документи треба д го извадите и повторно да го вратите овој медиум.</translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation>Кои датотеки</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Слики</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Видео</translation>
+    </message>
+    <message>
+        <source>Limit search to:</source>
+        <translation>Ограничи пребарување на:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Always check this medium</source>
+        <translation>Секогаш проверувај го овој медиум</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/mindbreaker.ts b/i18n/mk/mindbreaker.ts
new file mode 100644
index 0000000..ba06410
--- a/dev/null
+++ b/i18n/mk/mindbreaker.ts
@@ -0,0 +1,44 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MindBreaker</name>
+    <message>
+        <source>New Game</source>
+        <translation>Нова игра</translation>
+    </message>
+    <message>
+        <source>win avg: %1 turns (%2 games)</source>
+        <translation>просек на победи: %1 обиди (%2 игри)</translation>
+    </message>
+</context>
+<context>
+    <name>MindBreakerBoard</name>
+    <message>
+        <source>Go%1p%2</source>
+        <translation>Оди %1п%2</translation>
+    </message>
+    <message>
+        <source>CurrentGo%1</source>
+        <translation>Моментален Пат %1</translation>
+    </message>
+    <message>
+        <source>Answer%1</source>
+        <translation>Одговор %1</translation>
+    </message>
+    <message>
+        <source>Reset Statistics</source>
+        <translation>Ресетирај статистики</translation>
+    </message>
+    <message>
+        <source>Reset the win ratio?</source>
+        <translation>Ресетирај го бројот на победи?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/minesweep.ts b/i18n/mk/minesweep.ts
new file mode 100644
index 0000000..2bc7ea2
--- a/dev/null
+++ b/i18n/mk/minesweep.ts
@@ -0,0 +1,33 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MineSweep</name>
+    <message>
+        <source>You won!</source>
+        <translation>Победа!</translation>
+    </message>
+    <message>
+        <source>You exploded!</source>
+        <translation>Експлозија!</translation>
+    </message>
+    <message>
+        <source>Mine Hunt</source>
+        <translation>Лов на мини</translation>
+    </message>
+    <message>
+        <source>Beginner</source>
+        <translation>Почетник</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Напреден</translation>
+    </message>
+    <message>
+        <source>Expert</source>
+        <translation>Експерт</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Игра</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/networksettings.ts b/i18n/mk/networksettings.ts
new file mode 100644
index 0000000..cbe4bc1
--- a/dev/null
+++ b/i18n/mk/networksettings.ts
@@ -0,0 +1,135 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AddConnection</name>
+    <message>
+        <source>Add Network Connection</source>
+        <translation>Додади поврзување на мрежа</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation>&amp;Додај</translation>
+    </message>
+    <message>
+        <source>Services</source>
+        <translation>Сервиси</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Network Settings</source>
+        <translation>Подесувања на мрежа</translation>
+    </message>
+    <message>
+        <source>Connections</source>
+        <translation>Конекции</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>с</translation>
+    </message>
+    <message>
+        <source>t</source>
+        <translation>т</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>во</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation>&amp;Додај</translation>
+    </message>
+    <message>
+        <source>&amp;Information</source>
+        <translation type="obsolete">&amp;Информации</translation>
+    </message>
+    <message>
+        <source>&amp;Configure</source>
+        <translation>&amp;Подеси</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Отстрани</translation>
+    </message>
+    <message>
+        <source>Profiles</source>
+        <translation>Профили</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>&amp;Set Current</source>
+        <translation>&amp;Постави моментален</translation>
+    </message>
+    <message>
+        <source>Current Profile</source>
+        <translation>Моментален профил</translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Нов Профил</translation>
+    </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/odict.ts b/i18n/mk/odict.ts
new file mode 100644
index 0000000..cbcb6b4
--- a/dev/null
+++ b/i18n/mk/odict.ts
@@ -0,0 +1,111 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ConfigDlg</name>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>Searchmethod</source>
+        <translation>Метод на пребарување</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нов</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Измени</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+</context>
+<context>
+    <name>ODict</name>
+    <message>
+        <source>OPIE-Dictionary</source>
+        <translation>OPIE-речник</translation>
+    </message>
+    <message>
+        <source>Query:</source>
+        <translation>Прашање:</translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation>&amp;Ок</translation>
+    </message>
+    <message>
+        <source>No dictionary defined</source>
+        <translation>Нема дефиниран речник</translation>
+    </message>
+    <message>
+        <source>&amp;Define one</source>
+        <translation>&amp;Дефинирај еден</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Searchmethods</source>
+        <translation>Методи на пребарување</translation>
+    </message>
+    <message>
+        <source>C&amp;ase sensitive</source>
+        <translation>О&amp;сетливо на големи и мали букви</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Parameter</source>
+        <translation>Параметри</translation>
+    </message>
+    <message>
+        <source>Opie-Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchMethodDlg</name>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Dictionary file</source>
+        <translation>Датотека на речник</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Листај</translation>
+    </message>
+    <message>
+        <source>Language 1</source>
+        <translation>Јазик 1</translation>
+    </message>
+    <message>
+        <source>Decollator</source>
+        <translation>Деколатор</translation>
+    </message>
+    <message>
+        <source>Language 2</source>
+        <translation>Јазик 3</translation>
+    </message>
+    <message>
+        <source>New Searchmethod</source>
+        <translation>Нов метод на пребарување</translation>
+    </message>
+    <message>
+        <source>Change Searchmethod</source>
+        <translation>Смени метод на пребарување</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-console.ts b/i18n/mk/opie-console.ts
new file mode 100644
index 0000000..33bfa8f
--- a/dev/null
+++ b/i18n/mk/opie-console.ts
@@ -0,0 +1,878 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ATConfigDialog</name>
+    <message>
+        <source>Dialing parameter setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init string </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset string </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing prefix #1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing suffix #1 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing prefix #2 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing suffix #2 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing prefix #3 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing suffix #3 </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect string </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hang-up string </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay before redial </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number of tries </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DTR drop time (0=no) </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto bps detect </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem has DCD line </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multi-line untag </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BTConfigWidget</name>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Or peer mac address</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConfigureBase</name>
+    <message>
+        <source>Configure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ConsoleConfigWidget</name>
+    <message>
+        <source>Command to execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Environment Variables</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Value :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialDialog</name>
+    <message>
+        <source>Enter number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the number you want to dial. When finished, press ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditBase</name>
+    <message>
+        <source>Editor Base</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal Emulation:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IO Layer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Look</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Foreground:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gray</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Micro</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileReceive</name>
+    <message>
+        <source>Could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileTransfer</name>
+    <message>
+        <source>Was not able to fork</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FunctionKeyboardConfig</name>
+    <message>
+        <source>Dimensions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IOLayerBase</name>
+    <message>
+        <source>Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flow control</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Odd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Even</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Bits</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>6</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Bits</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600 baud</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IOSerial</name>
+    <message>
+        <source>Not connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid baud rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device is already connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IrdaConfigWidget</name>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Configure Profiles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QuickLaunch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open Keyboard...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New from Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scripts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemConfigWidget</name>
+    <message>
+        <source>Modem is attached to:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter telefon number here:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AT commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter number</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NoOptions</name>
+    <message>
+        <source>This Plugin does not support any configurations</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProfileEditorDialog</name>
+    <message>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto connect after load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Opie Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting failed for this session.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer protocol</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No file has been specified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancelled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The file transfer has been cancelled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Operation not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer could not be started.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undefined error occured.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incomplete transfer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error occured.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has been sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has been received.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Special Keys</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please enter a profile name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Z-Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Y-Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SynchronizedFile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing number: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing the number failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancelling...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset speakers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy, redialing number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection established</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dismiss</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SerialConfigWidget</name>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TerminalWidget</name>
+    <message>
+        <source>Terminal Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Color scheme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line-break conversions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Inbound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outbound</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local echo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VT 100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>VT 102</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linux Console</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>X-Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>black on white</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>white on black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>green on black</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>orange on black</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-login.ts b/i18n/mk/opie-login.ts
new file mode 100644
index 0000000..e368a55
--- a/dev/null
+++ b/i18n/mk/opie-login.ts
@@ -0,0 +1,97 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Притиснете на крстовите цврсто и 
+прецизно за да го калибрирате екранот.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Добредојдовте во Opie</translation>
+    </message>
+</context>
+<context>
+    <name>LoginWindow</name>
+    <message>
+        <source>Login</source>
+        <translation>Логирај се</translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
+        <translation>&lt;center&gt;Добредојдовре во OPIE &lt;/center&gt;</translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation>КОрисник</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Лозинка</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation>Суспензирај</translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation>Мени</translation>
+    </message>
+</context>
+<context>
+    <name>LoginWindowImpl</name>
+    <message>
+        <source>Restart</source>
+        <translation>Рестартирај</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Изклучи</translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
+        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+    </message>
+    <message>
+        <source>Wrong password</source>
+        <translation>Погрешна лозинка</translation>
+    </message>
+    <message>
+        <source>The given password is incorrect.</source>
+        <translation>Внесената лозинка е неточна.</translation>
+    </message>
+    <message>
+        <source>OPIE was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation type="obsolete">OPIE беше исклучен
+од неозначен сигнал
+(%1)</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation>Неуспех</translation>
+    </message>
+    <message>
+        <source>Could not start OPIE.</source>
+        <translation type="obsolete">Неможе да се стартува OPIE.</translation>
+    </message>
+    <message>
+        <source>Could not switch to new user identity</source>
+        <translation>Неможе да се префрли на нов идентитет на корисник</translation>
+    </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/opie-sh.ts b/i18n/mk/opie-sh.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/opie-sh.ts
+++ b/i18n/mk/opie-sh.ts
diff --git a/i18n/mk/opie-write.ts b/i18n/mk/opie-write.ts
new file mode 100644
index 0000000..db6849b
--- a/dev/null
+++ b/i18n/mk/opie-write.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нова</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation>Врати</translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <translation>Повтори</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Копирај</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Исечи</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Залепи</translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation>Тврдо</translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation>Закосено</translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation>&amp;Закосено</translation>
+    </message>
+    <message>
+        <source>Underline</source>
+        <translation>Подвлечи</translation>
+    </message>
+    <message>
+        <source>&amp;Underline</source>
+        <translation>&amp;Подвлечи</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Лево</translation>
+    </message>
+    <message>
+        <source>Center</source>
+        <translation>Центар</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Десно</translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation>Целосно</translation>
+    </message>
+    <message>
+        <source>Rich Text Editor</source>
+        <translation>Уредувач на текст</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation>Неименувано</translation>
+    </message>
+</context>
+<context>
+    <name>QTextEdit</name>
+    <message>
+        <source>&amp;Undo</source>
+        <translation>&amp;Врати</translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation>&amp;Повтори</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>&amp;Исечи</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Копирај</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Залепи</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Испразни</translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation>Избери се</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opieftp.ts b/i18n/mk/opieftp.ts
new file mode 100644
index 0000000..00e7b65
--- a/dev/null
+++ b/i18n/mk/opieftp.ts
@@ -0,0 +1,245 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OpieFtp</name>
+    <message>
+        <source>OpieFtp</source>
+        <translation>OpieFtp</translation>
+    </message>
+    <message>
+        <source>Connection</source>
+        <translation>Поврзување</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Local</source>
+        <translation>Локален</translation>
+    </message>
+    <message>
+        <source>Remote</source>
+        <translation>Одалечено</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation>Поврзи</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation>Откачи</translation>
+    </message>
+    <message>
+        <source>Show Hidden Files</source>
+        <translation>Покажи скриени датотеки</translation>
+    </message>
+    <message>
+        <source>Upload</source>
+        <translation>Испрати</translation>
+    </message>
+    <message>
+        <source>Make Directory</source>
+        <translation>Направи Директориум</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Преименувај</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation>Земи</translation>
+    </message>
+    <message>
+        <source>Switch to Local</source>
+        <translation>Префрли се локално</translation>
+    </message>
+    <message>
+        <source>Switch to Remote</source>
+        <translation>Префрли се далечинско</translation>
+    </message>
+    <message>
+        <source>Switch to Config</source>
+        <translation>Префрли се на конфигурација</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation>Директ</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Корисничко име</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Лозинка</translation>
+    </message>
+    <message>
+        <source>Remote server</source>
+        <translation>Сервер</translation>
+    </message>
+    <message>
+        <source>Remote path</source>
+        <translation>Патека</translation>
+    </message>
+    <message>
+        <source>Port</source>
+        <translation>Порта</translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Ftp</source>
+        <translation>Фтп</translation>
+    </message>
+    <message>
+        <source>Please set the server info</source>
+        <translation>Намести информации за сервер</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Забелешка</translation>
+    </message>
+    <message>
+        <source>Unable to connect to
+</source>
+        <translation>Неможе да се поврзе со</translation>
+    </message>
+    <message>
+        <source>Unable to log in
+</source>
+        <translation>Неможзе да се идентификува
+</translation>
+    </message>
+    <message>
+        <source>Unable to upload
+</source>
+        <translation>Неможе да се пренесе</translation>
+    </message>
+    <message>
+        <source>Cannot upload directories</source>
+        <translation>Неможре да се пренесат директориуми</translation>
+    </message>
+    <message>
+        <source>Unable to download 
+</source>
+        <translation>Неможе да се превземе
+</translation>
+    </message>
+    <message>
+        <source>Unable to list the directory
+</source>
+        <translation>Неможе да се излиста директориумот
+</translation>
+    </message>
+    <message>
+        <source>Unable to change directories
+</source>
+        <translation>Неможе да се сменат директориуми
+</translation>
+    </message>
+    <message>
+        <source>Unable to cd up
+</source>
+        <translation>Неможе да се отиде ниво погоре
+</translation>
+    </message>
+    <message>
+        <source>Unable to get working dir
+</source>
+        <translation>Неможе да се смени работен директориум
+</translation>
+    </message>
+    <message>
+        <source>Change Directory</source>
+        <translation>Смени Директориум</translation>
+    </message>
+    <message>
+        <source>Rescan</source>
+        <translation>Повторно скенирај</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete
+</source>
+        <translation>Дали стварно сакате да избришете
+</translation>
+    </message>
+    <message>
+        <source> ?
+It must be empty</source>
+        <translation>? мора да биде празен</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+    <message>
+        <source>Unable to make directory
+</source>
+        <translation>Неможе да се направи директориум</translation>
+    </message>
+    <message>
+        <source>Unable to remove directory
+</source>
+        <translation>Неможе да се отстрани директориумот
+</translation>
+    </message>
+    <message>
+        <source>Unable to delete file
+</source>
+        <translation>Неможе да се избрише датотеката
+</translation>
+    </message>
+    <message>
+        <source>Unable to rename file
+</source>
+        <translation>Неможеда се преименува датотеката
+</translation>
+    </message>
+    <message>
+        <source>Could not rename</source>
+        <translation>Неможе да се преименува</translation>
+    </message>
+    <message>
+        <source>That directory does not exist</source>
+        <translation>Директориумот не постои</translation>
+    </message>
+    <message>
+        <source>New Server name</source>
+        <translation>Ново име на сервер</translation>
+    </message>
+    <message>
+        <source>Sorry name already taken</source>
+        <translation>Името веќе постои</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opieirc.ts b/i18n/mk/opieirc.ts
new file mode 100644
index 0000000..04e0e56
--- a/dev/null
+++ b/i18n/mk/opieirc.ts
@@ -0,0 +1,514 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>IRCChannelTab</name>
+    <message>
+        <source>Talking on channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel discussion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type your message here to participate in the channel discussion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Whois</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCConnection</name>
+    <message>
+        <source>Connected, logging in ..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Successfully logged in.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Socket error : </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection closed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCMessageParser</name>
+    <message>
+        <source>Nonexistant channel join - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Person has already joined the channel - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You already joined the channel - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parting person not found - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel for part not found - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown sender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received PRIVMSG of unknown type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname change of an unknown person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown person quit - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> changed topic to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown channel topic - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP PING from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received a CTCP VERSION from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP ACTION with unknown person - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP ACTION with unknown channel - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CTCP ACTION with bad recipient</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode change has unknown type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode change with unknown person - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode change with unknown flag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode change with unknown kannel - Desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User modes not supported yet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You were kicked from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> was kicked from </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown person kick - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown channel kick - desynchronized?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server message with unknown channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You joined channel </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname is in use, please reconnect with a different nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No such nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCQueryTab</name>
+    <message>
+        <source>Talking to </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private discussion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type your text here in order to send a message to the other person</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCServerEditor</name>
+    <message>
+        <source>Profile name :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The name of this server profile in the overview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hostname :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The server to connect to - can be any valid host name or IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The server port to connect to. Usually 6667</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your nick name on the IRC network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Realname :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Your real name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password to connect to the server (if required)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channels :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comma-Separated list of all channels you would like to join automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit server information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profile name required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Host name required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Port required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Realname required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The channel list needs to contain a
+comma separated list of channel
+ names which start with either &apos;#&apos; or &apos;+&apos;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCServerList</name>
+    <message>
+        <source>Serverlist Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please choose a server profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the currently selected server profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit the currently selected server profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new server profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCServerTab</name>
+    <message>
+        <source>Connection to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCSettings</name>
+    <message>
+        <source>Lines displayed :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background color :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Background color to be used in chats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal text color :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used in chats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error color :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used to display errors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text written by yourself :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used to identify text written by yourself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text written by others :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used to identify text written by others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text written by the server :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used to identify text written by the server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notifications :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text color to be used to display notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IRCTab</name>
+    <message>
+        <source>Missing description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description of the tab&apos;s content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close this tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>IRC Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Server connections, channels, queries and other things will be placed here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IRC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new connection to an IRC server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure OpieIRC&apos;s behavior and appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opieplayer.ts b/i18n/mk/opieplayer.ts
new file mode 100644
index 0000000..f197939
--- a/dev/null
+++ b/i18n/mk/opieplayer.ts
@@ -0,0 +1,258 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioDevice</name>
+    <message>
+        <source>Somethin&apos;s wrong with
+your sound device.
+open(&quot;/dev/dsp&quot;)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+
+Closing player now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediaPlayer</name>
+    <message>
+        <source>No file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error: There is no file selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The following file was not found: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No decoder found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Operations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save PlayList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open File or URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file or URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save m3u Playlist </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VideoWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opierec.ts b/i18n/mk/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/mk/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
new file mode 100644
index 0000000..e2c8a8e
--- a/dev/null
+++ b/i18n/mk/osearch.ts
@@ -0,0 +1,143 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>OПребарување</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Детали за моменталниот резултат</translation>
+    </message>
+    <message>
+        <source>applications</source>
+        <translation type="obsolete">апликации</translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="obsolete">документи</translation>
+    </message>
+    <message>
+        <source>todo</source>
+        <translation type="obsolete">задолжениа</translation>
+    </message>
+    <message>
+        <source>datebook</source>
+        <translation type="obsolete">роковник</translation>
+    </message>
+    <message>
+        <source>adressbook</source>
+        <translation type="obsolete">адресар</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Пребарувај</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Спребарувај Се</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Внимавај на големи и мали букви</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>КОристи спец. карактери</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Внеси ги зборовите кои се пребаруваат</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Резултати</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show completed tasks</source>
+        <translation>прикажи завршени задачи</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>прикажи изминати настани</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>барај во датуми</translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation>прикажи</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>уреди</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>изврши</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>офтвори во управувач со датотеки</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Датотека:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Врска:</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>Тип:</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>отвори со</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>пребарај содржина</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>пребарување %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/oxygen.ts b/i18n/mk/oxygen.ts
new file mode 100644
index 0000000..702eab7
--- a/dev/null
+++ b/i18n/mk/oxygen.ts
@@ -0,0 +1,562 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CalcDlg</name>
+    <message>
+        <source>Molecular Weight</source>
+        <translation>Молекуларна тежина </translation>
+    </message>
+    <message>
+        <source>Chemical Formula</source>
+        <translation>Хемиска формула</translation>
+    </message>
+    <message>
+        <source>Calculate</source>
+        <translation>Израчунај</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Molecular Weight (u):</source>
+        <translation>Молекуларна тежина (u):</translation>
+    </message>
+    <message>
+        <source>Elemental Composition (%):</source>
+        <translation>Елементарни состојки (%):</translation>
+    </message>
+</context>
+<context>
+    <name>OxydataWidget</name>
+    <message>
+        <source>%1 u</source>
+        <translation>%1 u</translation>
+    </message>
+    <message>
+        <source>%1 pm</source>
+        <translation>%1 pm</translation>
+    </message>
+    <message>
+        <source>%1 J</source>
+        <translation>%1 J</translation>
+    </message>
+    <message>
+        <source>%1 g/cm^3</source>
+        <translation>%1 g/цм^3</translation>
+    </message>
+    <message>
+        <source>%1 K</source>
+        <translation>%1 K</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Тежина</translation>
+    </message>
+    <message>
+        <source>Block</source>
+        <translation>Блок</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Група</translation>
+    </message>
+    <message>
+        <source>Electronegativity</source>
+        <translation>Негативност на елекрон</translation>
+    </message>
+    <message>
+        <source>Atomic radius</source>
+        <translation>Радиус на атом</translation>
+    </message>
+    <message>
+        <source>Ionizationenergie</source>
+        <translation>Енергија на јонизација</translation>
+    </message>
+    <message>
+        <source>Density</source>
+        <translation>Густина</translation>
+    </message>
+    <message>
+        <source>Boilingpoint</source>
+        <translation>Точка на ротација</translation>
+    </message>
+    <message>
+        <source>Meltingpoint</source>
+        <translation>Точка на сретнување</translation>
+    </message>
+</context>
+<context>
+    <name>Oxygen</name>
+    <message>
+        <source>Oxygen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PSE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calculations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hydrogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Helium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lithium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beryllium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Boron</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Carbon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nitrogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fluorine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Neon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sodium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Magnesium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aluminum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Silicon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phosphorus</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sulfur</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chlorine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Potassium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calcium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scandium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Titanium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vanadium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chromium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manganese</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Iron</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cobalt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zinc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gallium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Germanium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Arsenic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selenium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bromine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Krypton</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rubidium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Strontium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yttrium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zirconium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Niobium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Molybdenum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Technetium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ruthenium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rhodium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palladium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Silver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cadmium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antimony</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tellurium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Iodine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Xenon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cesium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Barium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lanthanum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cerium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Praseodymium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Neodymium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Promethium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Samarium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Europium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gadolinium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terbium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dysprosium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Holmium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erbium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thulium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ytterbium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lutetium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hafnium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tantalum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tungsten</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rhenium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Osmium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Iridium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Platinum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mercury</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thallium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lead</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bismuth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Polonium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Astatine</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Francium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Radium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Actinium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thorium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protactinium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Uranium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Neptunium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plutonium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Americium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Curium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Berkelium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Californium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Einsteinium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fermium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mendelevium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nobelium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lawrencium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rutherfordium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dubnium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Seaborgium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bohrium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hassium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Meitnerium</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>Периоден Систем</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>ГРЕШКА:
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Хемиски податоци</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/parashoot.ts b/i18n/mk/parashoot.ts
new file mode 100644
index 0000000..19bfa5e
--- a/dev/null
+++ b/i18n/mk/parashoot.ts
@@ -0,0 +1,27 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ParaShoot</name>
+    <message>
+        <source>ParaShoot</source>
+        <translation>Падобранец</translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation>Нова игра</translation>
+    </message>
+    <message>
+        <source>     Level: %1       Score: %2   </source>
+        <translation>Ниво: %1 Поени: %2</translation>
+    </message>
+    <message>
+        <source>       GAME OVER!
+       Your Score:  %1
+ Parachuters Killed: %2
+        Accuracy: %3% </source>
+        <translation>Крај!
+Резултат: %1
+Убиени Падобранци: %2
+Прецизност: %3%</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/patience.ts b/i18n/mk/patience.ts
new file mode 100644
index 0000000..48700c3
--- a/dev/null
+++ b/i18n/mk/patience.ts
@@ -0,0 +1,97 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CanvasCardWindow</name>
+    <message>
+        <source>Patience</source>
+        <translation>Пасијанс</translation>
+    </message>
+    <message>
+        <source>Freecell</source>
+        <translation>Фрисел</translation>
+    </message>
+    <message>
+        <source>Chicane</source>
+        <translation>Чикане</translation>
+    </message>
+    <message>
+        <source>Harp</source>
+        <translation>Харп</translation>
+    </message>
+    <message>
+        <source>Teeclub</source>
+        <translation>клуб</translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation>&amp;Игра</translation>
+    </message>
+    <message>
+        <source>&amp;Change Card Backs</source>
+        <translation type="obsolete">&amp;Смени Карти</translation>
+    </message>
+    <message>
+        <source>&amp;Snap To Position</source>
+        <translation type="obsolete">&amp;Залепи за позиција</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Подесувања</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;За</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Помош</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Играј</translation>
+    </message>
+    <message>
+        <source>Change Card Backs</source>
+        <translation type="obsolete">Смени Карти</translation>
+    </message>
+    <message>
+        <source>Snap To Position</source>
+        <translation type="obsolete">Залепи за позиција</translation>
+    </message>
+    <message>
+        <source>Turn One Card</source>
+        <translation type="obsolete">сврти една карта</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Turn Three Cards</source>
+        <translation type="obsolete">Сврти три карти</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/qasteroids.ts b/i18n/mk/qasteroids.ts
new file mode 100644
index 0000000..82938a2
--- a/dev/null
+++ b/i18n/mk/qasteroids.ts
@@ -0,0 +1,41 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>KAstTopLevel</name>
+    <message>
+        <source>Asteroids</source>
+        <translation>Астероиди</translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation>Резултат</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ниво</translation>
+    </message>
+    <message>
+        <source>Ships</source>
+        <translation>Бродови</translation>
+    </message>
+    <message>
+        <source>Fuel</source>
+        <translation>Гориво</translation>
+    </message>
+    <message>
+        <source>Press Calendar to start playing</source>
+        <translation>Притисни на календарот за да почнеш да играш</translation>
+    </message>
+    <message>
+        <source>Ship Destroyed.
+Press Contacts/Home key.</source>
+        <translation>Уништени бродови.
+</translation>
+    </message>
+    <message>
+        <source>Game Over.
+Press Calendar for a new game.</source>
+        <translation>Крај
+Притисни на календарот за нова игра.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/qcop.ts b/i18n/mk/qcop.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/qcop.ts
+++ b/i18n/mk/qcop.ts
diff --git a/i18n/mk/qpdf.ts b/i18n/mk/qpdf.ts
new file mode 100644
index 0000000..e6af0b0
--- a/dev/null
+++ b/i18n/mk/qpdf.ts
@@ -0,0 +1,105 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QPdfDlg</name>
+    <message>
+        <source>QPdf</source>
+        <translation>QPdf</translation>
+    </message>
+    <message>
+        <source>Zoom</source>
+        <translation>Зум</translation>
+    </message>
+    <message>
+        <source>Fit to width</source>
+        <translation>Подеси на ширина</translation>
+    </message>
+    <message>
+        <source>Fit to page</source>
+        <translation>Подеси на страна</translation>
+    </message>
+    <message>
+        <source>50%</source>
+        <translation>50%</translation>
+    </message>
+    <message>
+        <source>75%</source>
+        <translation>75%</translation>
+    </message>
+    <message>
+        <source>100%</source>
+        <translation>100%</translation>
+    </message>
+    <message>
+        <source>125%</source>
+        <translation>125%</translation>
+    </message>
+    <message>
+        <source>150%</source>
+        <translation>150%</translation>
+    </message>
+    <message>
+        <source>200%</source>
+        <translation>200%</translation>
+    </message>
+    <message>
+        <source>Open...</source>
+        <translation>Отвори...</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Пронајди...</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Цел екран</translation>
+    </message>
+    <message>
+        <source>First page</source>
+        <translation>Прва Страна</translation>
+    </message>
+    <message>
+        <source>Previous page</source>
+        <translation>Претходна Страна</translation>
+    </message>
+    <message>
+        <source>Goto page...</source>
+        <translation>Оди на страна...</translation>
+    </message>
+    <message>
+        <source>Next page</source>
+        <translation>Следна Страна</translation>
+    </message>
+    <message>
+        <source>Last page</source>
+        <translation>Последна Страна</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Следна</translation>
+    </message>
+    <message>
+        <source>Goto page</source>
+        <translation>Оди на страна</translation>
+    </message>
+    <message>
+        <source>Select from 1 .. %1:</source>
+        <translation>Избери од 1 ..%1:</translation>
+    </message>
+    <message>
+        <source>&apos;%1&apos; could not be found.</source>
+        <translation>&apos;%1&apos; неможе да се најде.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>File does not exist !</source>
+        <translation type="obsolete">Датотеката не постои!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
new file mode 100644
index 0000000..73c5145
--- a/dev/null
+++ b/i18n/mk/qpe.ts
@@ -0,0 +1,256 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AppMonitor</name>
+    <message>
+        <source>Application Problem</source>
+        <translation>Проблем со апликацијата</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Кликни на крстовите цврсто и 
+прецизно за да го калибрираш екранот.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Добредојде во Opie</translation>
+    </message>
+</context>
+<context>
+    <name>CategoryTabWidget</name>
+    <message>
+        <source>Documents</source>
+        <translation>Документи</translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation>Преглед по икони</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation>Преглед по листа</translation>
+    </message>
+</context>
+<context>
+    <name>DesktopApplication</name>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation>Нивото на батеријата е критично!</translation>
+    </message>
+    <message>
+        <source>Battery is running very low.</source>
+        <translation>Нивото на батеријата е многу ниско.</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation>Помошната батерија е многу слаба.
+Наполни ја помошната батерија.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation>Визиткарта</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Информации</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
+(%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Launcher</name>
+    <message>
+        <source>Launcher</source>
+        <translation>Стартувач</translation>
+    </message>
+    <message>
+        <source>Finding documents</source>
+        <translation>Барање документи</translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation>Пребарување на документи</translation>
+    </message>
+    <message>
+        <source> - Launcher</source>
+        <translation>- Стартувач</translation>
+    </message>
+    <message>
+        <source>No application</source>
+        <translation>Нема Апликација</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
+        <translation>&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>%1 files</source>
+        <translation>%1 датотеки</translation>
+    </message>
+    <message>
+        <source>All types of file</source>
+        <translation>Аите типови на датотека</translation>
+    </message>
+    <message>
+        <source>Document View</source>
+        <translation>Преглед на документи</translation>
+    </message>
+</context>
+<context>
+    <name>MediumMountGui</name>
+    <message>
+        <source>Medium inserted</source>
+        <translation>Внесен медиум</translation>
+    </message>
+    <message>
+        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <translation>А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
+    </message>
+    <message>
+        <source>Which media files</source>
+        <translation>Кои датотеки</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Аудио</translation>
+    </message>
+    <message>
+        <source>Image</source>
+        <translation>Слика</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Текст</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Видео</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Сите</translation>
+    </message>
+    <message>
+        <source>Link apps</source>
+        <translation>Поврзи апликации</translation>
+    </message>
+    <message>
+        <source>Limit search to dir: (not used yet)</source>
+        <translation>Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Your decision will be stored on the medium.</source>
+        <translation>Твојата одлука ќе биде снимена на медиумот.</translation>
+    </message>
+    <message>
+        <source>Do not ask again for this medium</source>
+        <translation>Не го барај овој медиум пак</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Состојба на батерија</translation>
+    </message>
+</context>
+<context>
+    <name>ShutdownImpl</name>
+    <message>
+        <source>Shutdown...</source>
+        <translation>Изгаси...</translation>
+    </message>
+    <message>
+        <source>Terminate</source>
+        <translation>Исклучи</translation>
+    </message>
+    <message>
+        <source>Terminate Opie</source>
+        <translation>Исклучи Opie</translation>
+    </message>
+    <message>
+        <source>Reboot</source>
+        <translation>Рестартирај</translation>
+    </message>
+    <message>
+        <source>Restart Opie</source>
+        <translation>Рестартирај Opie</translation>
+    </message>
+    <message>
+        <source>Shutdown</source>
+        <translation>Изгаси</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;
+These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
+        <translation>&lt;p&gt;
+Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+</context>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation>Врска за синхронизирање</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation>&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Одбиј</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation>&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Дозволи</translation>
+    </message>
+</context>
+<context>
+    <name>SyncDialog</name>
+    <message>
+        <source>Syncing</source>
+        <translation>Синхронизирање</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Контакти&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/reader.ts b/i18n/mk/reader.ts
new file mode 100644
index 0000000..d13adb2
--- a/dev/null
+++ b/i18n/mk/reader.ts
@@ -0,0 +1,792 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CBarPrefs</name>
+    <message>
+        <source>Toolbar Settings</source>
+        <translation>Подесувања на палети</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Навигација</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Означувања</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Индикатори</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Политики</translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>Брзина на лизгање</translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished">Сними линк</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished">Нотација</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">Цел екран</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished">Назад</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished">Напред</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Дома</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
+    <message>
+        <source>Tidy-up</source>
+        <translation>Среди</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Избричи врски</translation>
+    </message>
+    <message>
+        <source>Delete Configuration</source>
+        <translation>Избриши конфигурација</translation>
+    </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвои</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Информации</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Две/Едно 
+кликање</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Најди</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Нагласување</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>Интернационални</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>идеограми</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Ширина на идеограм</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Користи фонт
+на дијалози</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Кодна табела</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Апликација</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Порака</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Две/Едно 
+кликање</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished">Речник</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
+        <source>Strip CR</source>
+        <translation>Тргни cr</translation>
+    </message>
+    <message>
+        <source>Dehyphen</source>
+        <translation>тргни хифенација</translation>
+    </message>
+    <message>
+        <source>Single Space</source>
+        <translation>единечен</translation>
+    </message>
+    <message>
+        <source>Unindent</source>
+        <translation>Итно</translation>
+    </message>
+    <message>
+        <source>Reparagraph</source>
+        <translation>Параграф</translation>
+    </message>
+    <message>
+        <source>Double Space</source>
+        <translation>Двоен</translation>
+    </message>
+    <message>
+        <source>Remap</source>
+        <translation>Ремапирај</translation>
+    </message>
+    <message>
+        <source>Embolden</source>
+        <translation>Појачај</translation>
+    </message>
+    <message>
+        <source>Full Justify</source>
+        <translation>Целосно порамни</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation>Идентификатор</translation>
+    </message>
+    <message>
+        <source>Page
+Overlap</source>
+        <translation>Страна
+префрлување</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Графика
+Зум</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Маргини</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Параграф
+Водечки</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Линија
+ВОвлекување</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Маркирај</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Фонт</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Сними линк</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Нотација</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Оди на</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избришу</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Генерирај Автоматски</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Маркирај Блок</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Копирај Блок</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Лебдечко</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Една палета</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Мени/Палета</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Повеќе палети</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Врв</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Дно</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Десно</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Лево</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Минимизирано</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Пренослива</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Нагласување</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Речник</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Клипборд</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Деплак</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>ДејПлак</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Постојано</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Лигај</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Страна Нагоре</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Страна Надоле</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Оди на почеток</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Оди на крај</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Скокни</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Лизгање на страна/линија</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>Подесување на Читачот</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Поставување</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>Поставување(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Јазик</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Општо</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>копчиња</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Сними Линк</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Клипборд</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Локална датотека</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>Глобална датотека</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Цел екран</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Зголеми</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Намали</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation>Намести фонт</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Кодна табела</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>идеограм</translation>
+    </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Навигација</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Означувања</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Сними Конфигурација</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>вчитај конфигурација</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Избриши конфигурација</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>палети</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Стартувај скрипта</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Информации</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>Две/Едно кликање</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Најди...</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Експорирај врски</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Поместувај</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Оди на почеток</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Оди на крај</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Скокни</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Лизгање на страна/линија</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>Нагоре</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>Надоле</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Поместување</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Постави цел</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Паузирај</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Цел екран</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>Зголеми</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>Намали</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation>Намести фонт</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Постави кодна табела</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>идеограм</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Сними линк</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Нотација</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Оди на</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>избриши</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Генерирај Автоматски</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Исчисти</translation>
+    </message>
+    <message>
+        <source>Start Block</source>
+        <translation>Почетен блок</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Копирај Блок</translation>
+    </message>
+    <message>
+        <source>Find Next</source>
+        <translation>Најди следно</translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation>Затвори пребарување</translation>
+    </message>
+    <message>
+        <source>Do Reg</source>
+        <translation>Регисрирај</translation>
+    </message>
+    <message>
+        <source>Close Edit</source>
+        <translation>Затвори уредување</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Нагласување</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>fileBrowser</name>
+    <message>
+        <source>Browse for file</source>
+        <translation>Покажи Датотека</translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation>/</translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation>Скриено</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/remote.ts b/i18n/mk/remote.ts
new file mode 100644
index 0000000..9320544
--- a/dev/null
+++ b/i18n/mk/remote.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>Remote</source>
+        <translation>Далечинско</translation>
+    </message>
+    <message>
+        <source>Learn</source>
+        <translation>Учи</translation>
+    </message>
+    <message>
+        <source>Config</source>
+        <translation>Конфигурирај</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Помош</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
new file mode 100644
index 0000000..d116ca2
--- a/dev/null
+++ b/i18n/mk/security.ts
@@ -0,0 +1,118 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Security</name>
+    <message>
+        <source>Set passcode</source>
+        <translation>Намести лозинја</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation>Смени лозинка</translation>
+    </message>
+    <message>
+        <source>Enter passcode</source>
+        <translation>Внеси лозинка</translation>
+    </message>
+    <message>
+        <source>Passcode incorrect</source>
+        <translation>Неточна лозинка</translation>
+    </message>
+    <message>
+        <source>The passcode entered is incorrect.
+Access denied</source>
+        <translation>Лозинката не е точна.
+Одбиен пристап</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <source>Enter new passcode</source>
+        <translation>Внеси нова лозинка</translation>
+    </message>
+    <message>
+        <source>Re-enter new passcode</source>
+        <translation>Повтторно внеси лозинка</translation>
+    </message>
+</context>
+<context>
+    <name>SecurityBase</name>
+    <message>
+        <source>Security Settings</source>
+        <translation>Сигурносни подесувања</translation>
+    </message>
+    <message>
+        <source>Change passcode</source>
+        <translation>Смени лозинка</translation>
+    </message>
+    <message>
+        <source>Clear passcode</source>
+        <translation>Избриши лозинка</translation>
+    </message>
+    <message>
+        <source>Require pass code at power-on</source>
+        <translation>Барај лозинка на подигање</translation>
+    </message>
+    <message>
+        <source>Sync</source>
+        <translation>Синхронизирај</translation>
+    </message>
+    <message>
+        <source>Accept sync from network:</source>
+        <translation>Прифати синхронизација од мрежа:</translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24 (default)</source>
+        <translation>192.168.129.0/24 (основна)</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation>192.168.1.0/24 </translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation>192.168.0.0/24 </translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation>172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation>10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation>1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Any</source>
+        <translation>Секој</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <translation>&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_CN/sfcave.ts b/i18n/mk/sfcave.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/zh_CN/sfcave.ts
+++ b/i18n/mk/sfcave.ts
diff --git a/i18n/mk/sheetqt.ts b/i18n/mk/sheetqt.ts
new file mode 100644
index 0000000..958ba56
--- a/dev/null
+++ b/i18n/mk/sheetqt.ts
@@ -0,0 +1,787 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CellFormat</name>
+    <message>
+        <source>&amp;Borders</source>
+        <translation>&amp;Граници</translation>
+    </message>
+    <message>
+        <source>Back&amp;ground</source>
+        <translation>Поза&amp;дина</translation>
+    </message>
+    <message>
+        <source>&amp;Font</source>
+        <translation>&amp;Фонт</translation>
+    </message>
+    <message>
+        <source>&amp;Alignment</source>
+        <translation>&amp;Редење</translation>
+    </message>
+    <message>
+        <source>&amp;Width:</source>
+        <translation>&amp;Ширина:</translation>
+    </message>
+    <message>
+        <source>&amp;Color:</source>
+        <translation>&amp;Боја:</translation>
+    </message>
+    <message>
+        <source>&amp;Default Borders</source>
+        <translation>&amp;Основни Граници</translation>
+    </message>
+    <message>
+        <source>&amp;Style:</source>
+        <translation>&amp;Стил:</translation>
+    </message>
+    <message>
+        <source>&amp;Default Background</source>
+        <translation>&amp;Основна Позадина</translation>
+    </message>
+    <message>
+        <source>&amp;Font:</source>
+        <translation>&amp;Фонт:</translation>
+    </message>
+    <message>
+        <source>&amp;Size:</source>
+        <translation>&amp;Големина:</translation>
+    </message>
+    <message>
+        <source>&amp;Bold</source>
+        <translation>&amp;Здебелено</translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation>&amp;Закосени</translation>
+    </message>
+    <message>
+        <source>&amp;Default Font</source>
+        <translation>&amp;Основен Фонт</translation>
+    </message>
+    <message>
+        <source>&amp;Vertical:</source>
+        <translation>&amp;Вертикална:</translation>
+    </message>
+    <message>
+        <source>&amp;Horizontal:</source>
+        <translation>&amp;Хоризинтална:</translation>
+    </message>
+    <message>
+        <source>&amp;Word Wrap</source>
+        <translation>&amp;Префралње на зборови</translation>
+    </message>
+    <message>
+        <source>&amp;Default Alignment</source>
+        <translation>&amp;Основно Редење</translation>
+    </message>
+    <message>
+        <source>Format Cells</source>
+        <translation>Форматирај ќелии</translation>
+    </message>
+    <message>
+        <source>Opie Sheet</source>
+        <translation>Оpie Табела</translation>
+    </message>
+</context>
+<context>
+    <name>FindDialog</name>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation>&amp;Пронајди &amp;&amp; Смени</translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation>&amp;Опции</translation>
+    </message>
+    <message>
+        <source>&amp;Search for:</source>
+        <translation>&amp;Барај:</translation>
+    </message>
+    <message>
+        <source>&amp;Replace with:</source>
+        <translation>&amp;Смени со:</translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation>&amp;Тип</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>&amp;Пронајди</translation>
+    </message>
+    <message>
+        <source>&amp;Replace</source>
+        <translation>&amp;Смени</translation>
+    </message>
+    <message>
+        <source>Replace &amp;all</source>
+        <translation>Смени ги &amp;Сите</translation>
+    </message>
+    <message>
+        <source>Match &amp;case</source>
+        <translation>Големи и мали &amp;Букви</translation>
+    </message>
+    <message>
+        <source>Current &amp;selection only</source>
+        <translation>Само моментална  &amp; селекција</translation>
+    </message>
+    <message>
+        <source>&amp;Entire cell</source>
+        <translation>&amp; Цела ќелија</translation>
+    </message>
+    <message>
+        <source>Find &amp; Replace</source>
+        <translation>Пронајди &amp; Смени</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Opie Sheet</source>
+        <translation>Опие Табелар</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Inconsistency error!</source>
+        <translation>Неконзистентност!</translation>
+    </message>
+    <message>
+        <source>File cannot be saved!</source>
+        <translation>Датотеката неможе да се сними!</translation>
+    </message>
+    <message>
+        <source>File cannot be opened!</source>
+        <translation>Датотеката неможе да се отвори!</translation>
+    </message>
+    <message>
+        <source>Invalid file format!</source>
+        <translation>Невалиден формат!</translation>
+    </message>
+    <message>
+        <source>Save File</source>
+        <translation>Сними датотека</translation>
+    </message>
+    <message>
+        <source>Do you want to save the current file?</source>
+        <translation>Да се сними оваа датотека?</translation>
+    </message>
+    <message>
+        <source>&amp;File Name:</source>
+        <translation>&amp;Име на датотека:</translation>
+    </message>
+    <message>
+        <source>UnnamedFile</source>
+        <translation>Неименувана Датотека</translation>
+    </message>
+    <message>
+        <source>New File</source>
+        <translation>Нова Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;New</source>
+        <translation>&amp;Нова</translation>
+    </message>
+    <message>
+        <source>Open File</source>
+        <translation>Отвори Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;Open</source>
+        <translation>&amp;Отвори</translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation>&amp;Сними</translation>
+    </message>
+    <message>
+        <source>Save File As</source>
+        <translation>Сними датотека како</translation>
+    </message>
+    <message>
+        <source>Save &amp;As</source>
+        <translation>Сними &amp;како</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Прифати</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Прифати</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>Cell Selector</source>
+        <translation>Избирач на ќелии</translation>
+    </message>
+    <message>
+        <source>Cell &amp;Selector</source>
+        <translation>Изб&amp;ирач на ќелии</translation>
+    </message>
+    <message>
+        <source>Cut Cells</source>
+        <translation>Исечи ќелии</translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation>Исе&amp;чи</translation>
+    </message>
+    <message>
+        <source>Copy Cells</source>
+        <translation>Копирај ќелии</translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation>&amp;Копирај</translation>
+    </message>
+    <message>
+        <source>Paste Cells</source>
+        <translation>Залепи ќелии</translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation>&amp;Залепи</translation>
+    </message>
+    <message>
+        <source>Paste Contents</source>
+        <translation>Залепи Содржина</translation>
+    </message>
+    <message>
+        <source>Paste Cont&amp;ents</source>
+        <translation>Залепи Содр&amp;жина</translation>
+    </message>
+    <message>
+        <source>Clear Cells</source>
+        <translation>Избриши Ќелии</translation>
+    </message>
+    <message>
+        <source>C&amp;lear</source>
+        <translation>Ис&amp;празни</translation>
+    </message>
+    <message>
+        <source>Insert Cells</source>
+        <translation>Вметни ќелии</translation>
+    </message>
+    <message>
+        <source>C&amp;ells</source>
+        <translation>Ќ&amp;елии</translation>
+    </message>
+    <message>
+        <source>Insert Rows</source>
+        <translation>Вметни редови</translation>
+    </message>
+    <message>
+        <source>&amp;Rows</source>
+        <translation>&amp;редови</translation>
+    </message>
+    <message>
+        <source>Insert Columns</source>
+        <translation>Вметни колони</translation>
+    </message>
+    <message>
+        <source>&amp;Columns</source>
+        <translation>&amp;Колони</translation>
+    </message>
+    <message>
+        <source>Add Sheets</source>
+        <translation>Додај листови</translation>
+    </message>
+    <message>
+        <source>&amp;Sheets</source>
+        <translation>&amp;Листови</translation>
+    </message>
+    <message>
+        <source>Cells</source>
+        <translation>Ќелии</translation>
+    </message>
+    <message>
+        <source>&amp;Cells</source>
+        <translation>&amp;Ќелии</translation>
+    </message>
+    <message>
+        <source>Row Height</source>
+        <translation>Висина на ред</translation>
+    </message>
+    <message>
+        <source>H&amp;eight</source>
+        <translation>Виси&amp;на</translation>
+    </message>
+    <message>
+        <source>Adjust Row</source>
+        <translation>Подеси ред</translation>
+    </message>
+    <message>
+        <source>&amp;Adjust</source>
+        <translation>&amp;подеси</translation>
+    </message>
+    <message>
+        <source>Show Row</source>
+        <translation>Покажи ред</translation>
+    </message>
+    <message>
+        <source>&amp;Show</source>
+        <translation>&amp;Покажи</translation>
+    </message>
+    <message>
+        <source>Hide Row</source>
+        <translation>Скриј ред</translation>
+    </message>
+    <message>
+        <source>&amp;Hide</source>
+        <translation>&amp;Скриј</translation>
+    </message>
+    <message>
+        <source>Column Width</source>
+        <translation>Ширина на колона</translation>
+    </message>
+    <message>
+        <source>&amp;Width</source>
+        <translation>&amp;Шитина</translation>
+    </message>
+    <message>
+        <source>Adjust Column</source>
+        <translation>Подеси колона</translation>
+    </message>
+    <message>
+        <source>Show Column</source>
+        <translation>Покажи колона</translation>
+    </message>
+    <message>
+        <source>Hide Column</source>
+        <translation>Скриј колона</translation>
+    </message>
+    <message>
+        <source>Rename Sheet</source>
+        <translation>Преименувај Лист</translation>
+    </message>
+    <message>
+        <source>&amp;Rename</source>
+        <translation>&amp;Преименувај</translation>
+    </message>
+    <message>
+        <source>Remove Sheet</source>
+        <translation>Одстрани лист</translation>
+    </message>
+    <message>
+        <source>R&amp;emove</source>
+        <translation>Од&amp;страни</translation>
+    </message>
+    <message>
+        <source>Sort Data</source>
+        <translation>Подреди Податоци</translation>
+    </message>
+    <message>
+        <source>&amp;Sort</source>
+        <translation>&amp;Сортирај</translation>
+    </message>
+    <message>
+        <source>Find &amp;&amp; Replace</source>
+        <translation>Пронајди &amp;&amp; Смени</translation>
+    </message>
+    <message>
+        <source>&amp;Find &amp;&amp; Replace</source>
+        <translation>&amp;Пронајди &amp;&amp; Смени</translation>
+    </message>
+    <message>
+        <source>Equal To</source>
+        <translation>Еднакво на</translation>
+    </message>
+    <message>
+        <source>&amp;Equal To</source>
+        <translation>&amp;Еднакво на</translation>
+    </message>
+    <message>
+        <source>Addition</source>
+        <translation>Собирање</translation>
+    </message>
+    <message>
+        <source>&amp;Addition</source>
+        <translation>&amp;Собирање</translation>
+    </message>
+    <message>
+        <source>Subtraction</source>
+        <translation>Одземање</translation>
+    </message>
+    <message>
+        <source>&amp;Subtraction</source>
+        <translation>&amp;Одземање</translation>
+    </message>
+    <message>
+        <source>Multiplication</source>
+        <translation>Множење</translation>
+    </message>
+    <message>
+        <source>&amp;Multiplication</source>
+        <translation>&amp;Множење</translation>
+    </message>
+    <message>
+        <source>Division</source>
+        <translation>Делење</translation>
+    </message>
+    <message>
+        <source>&amp;Division</source>
+        <translation>&amp;Делење</translation>
+    </message>
+    <message>
+        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
+        <translation>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
+    </message>
+    <message>
+        <source>&amp;Open Paranthesis</source>
+        <translation>&amp;Отвори Наводници</translation>
+    </message>
+    <message>
+        <source>Close Paranthesis</source>
+        <translation>Затвори Наводници</translation>
+    </message>
+    <message>
+        <source>&amp;Close Paranthesis</source>
+        <translation>&amp;Затвори Наводници</translation>
+    </message>
+    <message>
+        <source>Comma</source>
+        <translation>Запирка</translation>
+    </message>
+    <message>
+        <source>&amp;Comma</source>
+        <translation>&amp;Запирка</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;Edit</source>
+        <translation>&amp;уреди</translation>
+    </message>
+    <message>
+        <source>&amp;Insert</source>
+        <translation>&amp;Вметни</translation>
+    </message>
+    <message>
+        <source>&amp;Format</source>
+        <translation>&amp;Формат</translation>
+    </message>
+    <message>
+        <source>&amp;Data</source>
+        <translation>&amp;Податоци</translation>
+    </message>
+    <message>
+        <source>&amp;Row</source>
+        <translation>&amp;Ред</translation>
+    </message>
+    <message>
+        <source>Colum&amp;n</source>
+        <translation>Коло&amp;на</translation>
+    </message>
+    <message>
+        <source>&amp;Sheet</source>
+        <translation>&amp;Лист</translation>
+    </message>
+    <message>
+        <source>&amp;Function</source>
+        <translation>&amp;Функција</translation>
+    </message>
+    <message>
+        <source>&amp;Standard</source>
+        <translation>&amp;Стандарно</translation>
+    </message>
+    <message>
+        <source>Summation</source>
+        <translation>Сума</translation>
+    </message>
+    <message>
+        <source>&amp;Summation</source>
+        <translation>&amp;Сума</translation>
+    </message>
+    <message>
+        <source>Absolute Value</source>
+        <translation>Абсолутна Вредност</translation>
+    </message>
+    <message>
+        <source>&amp;Absolute</source>
+        <translation>&amp;Апсолутна</translation>
+    </message>
+    <message>
+        <source>Sine</source>
+        <translation>Цела</translation>
+    </message>
+    <message>
+        <source>Si&amp;ne</source>
+        <translation>Се&amp;ла</translation>
+    </message>
+    <message>
+        <source>Arc Sine</source>
+        <translation>Аркус синус</translation>
+    </message>
+    <message>
+        <source>A&amp;rc Sine</source>
+        <translation>А&amp;ркус синус</translation>
+    </message>
+    <message>
+        <source>Cosine</source>
+        <translation>Косинус</translation>
+    </message>
+    <message>
+        <source>&amp;Cosine</source>
+        <translation>&amp;Косинус</translation>
+    </message>
+    <message>
+        <source>ArcCosine</source>
+        <translation>Акрус косинус</translation>
+    </message>
+    <message>
+        <source>Arc Cos&amp;ine</source>
+        <translation>Аркус Коси&amp;нус</translation>
+    </message>
+    <message>
+        <source>Tangent</source>
+        <translation>Тангента</translation>
+    </message>
+    <message>
+        <source>&amp;Tangent</source>
+        <translation>&amp;Тангента</translation>
+    </message>
+    <message>
+        <source>Arc Tangent</source>
+        <translation>Аркус тангенс</translation>
+    </message>
+    <message>
+        <source>Arc Tan&amp;gent</source>
+        <translation>Аркус &amp;тангенс</translation>
+    </message>
+    <message>
+        <source>Arc Tangent of Coordinates</source>
+        <translation>Аркус Тангенс на координати</translation>
+    </message>
+    <message>
+        <source>C&amp;oor. Arc Tangent</source>
+        <translation>&amp;Аркус Тангенс</translation>
+    </message>
+    <message>
+        <source>Exponential</source>
+        <translation>Експоненцијално</translation>
+    </message>
+    <message>
+        <source>&amp;Exponential</source>
+        <translation>&amp;Експоненцијално</translation>
+    </message>
+    <message>
+        <source>Logarithm</source>
+        <translation>Логаритам</translation>
+    </message>
+    <message>
+        <source>&amp;Logarithm</source>
+        <translation>&amp;Логаритам</translation>
+    </message>
+    <message>
+        <source>Power</source>
+        <translation>Моќ</translation>
+    </message>
+    <message>
+        <source>&amp;Power</source>
+        <translation>&amp;Моќ</translation>
+    </message>
+    <message>
+        <source>&amp;Mathematical</source>
+        <translation>&amp;Математички</translation>
+    </message>
+    <message>
+        <source>Average</source>
+        <translation>Просек</translation>
+    </message>
+    <message>
+        <source>&amp;Average</source>
+        <translation>&amp;Просек</translation>
+    </message>
+    <message>
+        <source>Maximum</source>
+        <translation>Максимум</translation>
+    </message>
+    <message>
+        <source>Ma&amp;ximum</source>
+        <translation>Ма&amp;ксимум</translation>
+    </message>
+    <message>
+        <source>Minimum</source>
+        <translation>Минимум</translation>
+    </message>
+    <message>
+        <source>&amp;Minimum</source>
+        <translation>&amp;Минимум</translation>
+    </message>
+    <message>
+        <source>Count</source>
+        <translation>Брои</translation>
+    </message>
+    <message>
+        <source>&amp;Count</source>
+        <translation>&amp;Брои</translation>
+    </message>
+    <message>
+        <source>&amp;Statistical</source>
+        <translation>&amp;статистика</translation>
+    </message>
+    <message>
+        <source>Functions</source>
+        <translation>Функции</translation>
+    </message>
+    <message>
+        <source>About Opie Sheet</source>
+        <translation>За </translation>
+    </message>
+    <message>
+        <source>Opie Sheet
+Spreadsheet Software for Opie
+QWDC Beta Winner (as Sheet/Qt)
+
+Developed by: Serdar Ozler
+Release 1.0.2
+Release Date: October 08, 2002
+
+This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
+
+http://qtopia.sitebest.com</source>
+        <translation>Опие Табелар</translation>
+    </message>
+    <message>
+        <source>&amp;Number of rows:</source>
+        <translation>&amp;Број на редови:</translation>
+    </message>
+    <message>
+        <source>&amp;Number of columns:</source>
+        <translation>&amp;Број на колони:</translation>
+    </message>
+    <message>
+        <source>&amp;Number of sheets:</source>
+        <translation>&amp;Број на листови:</translation>
+    </message>
+    <message>
+        <source>Sheet</source>
+        <translation>Лист</translation>
+    </message>
+    <message>
+        <source>&amp;Height of each row:</source>
+        <translation>&amp;Восона на секој ред:</translation>
+    </message>
+    <message>
+        <source>&amp;Width of each column:</source>
+        <translation>&amp;Ширина на секоја колона:</translation>
+    </message>
+    <message>
+        <source>&amp;Sheet Name:</source>
+        <translation>&amp;Име на лист:</translation>
+    </message>
+    <message>
+        <source>There is only one sheet!</source>
+        <translation>Има само еден лист!</translation>
+    </message>
+    <message>
+        <source>Are you sure?</source>
+        <translation>Сигурно?</translation>
+    </message>
+    <message>
+        <source>&amp;Type</source>
+        <translation>&amp;Тип</translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;down</source>
+        <translation>Помести ќелии &amp;надоле</translation>
+    </message>
+    <message>
+        <source>Shift cells &amp;right</source>
+        <translation>Помесит ќелии &amp;десно</translation>
+    </message>
+    <message>
+        <source>Entire ro&amp;w</source>
+        <translation>Цел &amp;ред</translation>
+    </message>
+    <message>
+        <source>Entire &amp;column</source>
+        <translation>Цела &amp;колона</translation>
+    </message>
+</context>
+<context>
+    <name>Sheet</name>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Syntax error!</source>
+        <translation>Синтаксна грешка!</translation>
+    </message>
+    <message>
+        <source>Search key not found!</source>
+        <translation>Зборот за пребарување не е најден!</translation>
+    </message>
+</context>
+<context>
+    <name>SortDialog</name>
+    <message>
+        <source>&amp;Sort</source>
+        <translation>&amp;Нареди</translation>
+    </message>
+    <message>
+        <source>&amp;Options</source>
+        <translation>&amp;Опции</translation>
+    </message>
+    <message>
+        <source>&amp;Sort by</source>
+        <translation>&amp;Нареди по</translation>
+    </message>
+    <message>
+        <source>&amp;Then by</source>
+        <translation>&amp;Потоа по</translation>
+    </message>
+    <message>
+        <source>Then &amp;by</source>
+        <translation>Потоа &amp;по</translation>
+    </message>
+    <message>
+        <source>&amp;Case Sensitive</source>
+        <translation>&amp;Внимавај на фолеми и мали букви</translation>
+    </message>
+    <message>
+        <source>&amp;Direction</source>
+        <translation>&amp;Насока</translation>
+    </message>
+    <message>
+        <source>&amp;Top to bottom (rows)</source>
+        <translation>&amp;Горе до доле (редови)</translation>
+    </message>
+    <message>
+        <source>&amp;Left to right (columns)</source>
+        <translation>&amp;Лево до десно (колони)</translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation>Нареди</translation>
+    </message>
+    <message>
+        <source>&amp;Ascending</source>
+        <translation>&amp;Растечки</translation>
+    </message>
+    <message>
+        <source>&amp;Descending</source>
+        <translation>&amp;Опаѓачки</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>One cell cannot be sorted!</source>
+        <translation>Една ќелија неможе да се нареди!</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/showimg.ts b/i18n/mk/showimg.ts
new file mode 100644
index 0000000..d578f90
--- a/dev/null
+++ b/i18n/mk/showimg.ts
@@ -0,0 +1,158 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation>Светлина</translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation>Наслов</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+</context>
+<context>
+    <name>ImageViewer</name>
+    <message>
+        <source>Image Viewer</source>
+        <translation>Прегледувач на слики</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation>Мал преглед</translation>
+    </message>
+    <message>
+        <source>Slide show</source>
+        <translation>Слајд-приказ</translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation>Својства..</translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation>Информации за слика...</translation>
+    </message>
+    <message>
+        <source>Horizontal flip</source>
+        <translation>Префрли Хоринзотално</translation>
+    </message>
+    <message>
+        <source>Vertical flip</source>
+        <translation>Префрли Вертикално</translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation>Отвори...</translation>
+    </message>
+    <message>
+        <source>Rotate 90</source>
+        <translation>Ротирај 90</translation>
+    </message>
+    <message>
+        <source>Rotate 180</source>
+        <translation>Ротирај 180</translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation>Ротирај 270</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation>Светлина...</translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation>ЦрноБела</translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation>Зголеми/Намали на екран</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Цел екран</translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation>Сопри Слајд-приказ</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source> - Image Viewer</source>
+        <translation> - Прегледувач на слики</translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation>%1 бои</translation>
+    </message>
+    <message>
+        <source> True color</source>
+        <translation>Вистински бои</translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation>%1 алфа нивоа</translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation>8-битен алфа канал</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation>Својства</translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation>Слајд-приказ</translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation>Каснење помеѓу слики</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>с</translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation>Повтори Слајд-приказ</translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation>Прикажи ги сликите обратно</translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation>Вчитај ги сликите ротирани за 90 степени</translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation>Брзо вчитување на слики</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/snake.ts b/i18n/mk/snake.ts
new file mode 100644
index 0000000..6e46fe7
--- a/dev/null
+++ b/i18n/mk/snake.ts
@@ -0,0 +1,50 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SnakeGame</name>
+    <message>
+        <source>Snake</source>
+        <translation>Змија</translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation>Нова Игра</translation>
+    </message>
+    <message>
+        <source>SNAKE!</source>
+        <translation>ЗМИЈА!</translation>
+    </message>
+    <message>
+        <source>Use the arrow keys to guide the
+snake to eat the mouse. You must not
+crash into the walls, edges or its tail.</source>
+        <translation>Користи ги стрелките за да ја управуваш
+смијата да го изеде глувчето. Не смееш да
+се удриш во зидовите, на краевите од екранот или опашката.</translation>
+    </message>
+    <message>
+        <source>Press Any Key To Start</source>
+        <translation type="obsolete">Притисни копче за Старт</translation>
+    </message>
+    <message>
+        <source>     Score :    %1   </source>
+        <translation>Резултат: %1</translation>
+    </message>
+    <message>
+        <source>GAME OVER!
+ Your Score: %1</source>
+        <translation>КРАЈ!!! Резултат: %1</translation>
+    </message>
+    <message>
+        <source>Press Any Key to Begin a New Game.</source>
+        <translation type="obsolete">Притисни копче за Нова Игра.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/sound.ts b/i18n/mk/sound.ts
new file mode 100644
index 0000000..2508a15
--- a/dev/null
+++ b/i18n/mk/sound.ts
@@ -0,0 +1,128 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SoundSettings</name>
+    <message>
+        <source>Shows icon</source>
+        <translation>Покажува икона</translation>
+    </message>
+    <message>
+        <source>Hides icon</source>
+        <translation>Крие икона</translation>
+    </message>
+</context>
+<context>
+    <name>SoundSettingsBase</name>
+    <message>
+        <source>Vmemo Settings</source>
+        <translation>Подесувања за Vmemo</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation>Стерео</translation>
+    </message>
+    <message>
+        <source>16 bit</source>
+        <translation>16 битно</translation>
+    </message>
+    <message>
+        <source>Visual Alerts</source>
+        <translation>Визуелни аларми</translation>
+    </message>
+    <message>
+        <source>Sample Rate:</source>
+        <translation>Квалитет:</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>33075</source>
+        <translation>33075</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>Recording Directory:</source>
+        <translation>Директориум за снимање:</translation>
+    </message>
+    <message>
+        <source>Recording Key:</source>
+        <translation>Копче за снимање:</translation>
+    </message>
+    <message>
+        <source>Taskbar Icon</source>
+        <translation>Икона на панел</translation>
+    </message>
+    <message>
+        <source>Key_Record</source>
+        <translation>Копче_Снимај</translation>
+    </message>
+    <message>
+        <source>Key_Space</source>
+        <translation>Копче_Празен простор</translation>
+    </message>
+    <message>
+        <source>Key_Home</source>
+        <translation>Копче_Дома</translation>
+    </message>
+    <message>
+        <source>Key_Calender</source>
+        <translation>Копче_Календар</translation>
+    </message>
+    <message>
+        <source>Key_Contacts</source>
+        <translation>Копче_Контакти</translation>
+    </message>
+    <message>
+        <source>Key_Menu</source>
+        <translation>Копче_Мени</translation>
+    </message>
+    <message>
+        <source>Key_Mail</source>
+        <translation>Копче_Маил</translation>
+    </message>
+    <message>
+        <source>Recording Limit in seconds:</source>
+        <translation>Граница на снимање (во секунди):</translation>
+    </message>
+    <message>
+        <source>30</source>
+        <translation>30</translation>
+    </message>
+    <message>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Неограничено</translation>
+    </message>
+    <message>
+        <source>Restart Opie if needed</source>
+        <translation>Рестартирај го Opiе ако треба</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/sshkeys.ts b/i18n/mk/sshkeys.ts
new file mode 100644
index 0000000..e3d888a
--- a/dev/null
+++ b/i18n/mk/sshkeys.ts
@@ -0,0 +1,40 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SSHKeysApp</name>
+    <message>
+        <source>Error running ssh-add</source>
+        <translation>Грешка при вчитување на ssh-add</translation>
+    </message>
+</context>
+<context>
+    <name>SSHKeysBase</name>
+    <message>
+        <source>SSH Keys</source>
+        <translation>SSH клучеви</translation>
+    </message>
+    <message>
+        <source>Add Keys:</source>
+        <translation>Додај Клучеви:</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Освежи</translation>
+    </message>
+    <message>
+        <source>Clear Keys</source>
+        <translation>Избриши клучеви</translation>
+    </message>
+    <message>
+        <source>Key Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Отпечаток</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/stockticker.ts b/i18n/mk/stockticker.ts
new file mode 100644
index 0000000..0e3d4b1
--- a/dev/null
+++ b/i18n/mk/stockticker.ts
@@ -0,0 +1,69 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Отвори Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Затвори</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Назад</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Напред</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Дома</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Додај линк</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>
+&amp;Датотека</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Оди</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Историја</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Линкови</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Напред</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Дома</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Барање на симболи</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Внеси нешто за пребарување.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
new file mode 100644
index 0000000..78ff4d3
--- a/dev/null
+++ b/i18n/mk/sysinfo.ts
@@ -0,0 +1,296 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Овој граф прикажува колку меморија се користи на оваа Flash картичка.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Овој граф прикажува колку простор има на дискот.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Овој граф покажува колку меморија се користи на оваа SD картичка.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>ln</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
+    </message>
+</context>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation>Апликации на процесорот (%)</translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation>Користење на системскиот процесор (%)</translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation>Тип:</translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation>Оваа страна покажува како меморијата се алоцира на овој уред,
+Меморијата се каратеризира според:
+
+1. Искористена - меморија која ја искоритуваат апликациите
+2. Бафери - привремени локации кои се користат за подобрување на перформансите
+3. Кеширани - информации кои биле скоро користени
+4. Слободна - меморија која не се користи.</translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation>Искористени (%1) кВ</translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation>Бафери ( %1 кВ)</translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation>Кеширана (%1) кВ</translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation>Слободна (%1 кВ)</translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation>Вкупно меморија: %1 кВ</translation>
+    </message>
+</context>
+<context>
+    <name>ModulesInfo</name>
+    <message>
+        <source>Module</source>
+        <translation>Модул</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Големина</translation>
+    </message>
+    <message>
+        <source>Use#</source>
+        <translation>Искоритено#</translation>
+    </message>
+    <message>
+        <source>Used By</source>
+        <translation type="obsolete">Искористено од</translation>
+    </message>
+    <message>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <translation>Ова е листа на сите вчитани модули на кернелот.
+
+Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
+    </message>
+    <message>
+        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
+        <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Прати</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected command to the module selected above.</source>
+        <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this module.</source>
+        <translation>Овој дел прикажува детални информации за модулот.</translation>
+    </message>
+    <message>
+        <source>You really want to execute
+</source>
+        <translation type="obsolete">Да се изврши</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MountInfo</name>
+    <message>
+        <source> : %1 kB</source>
+        <translation>: %1 кВ</translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation>Искористени (%1) кВ</translation>
+    </message>
+    <message>
+        <source>Available (%1 kB)</source>
+        <translation>Словофни (%1 кВ)</translation>
+    </message>
+</context>
+<context>
+    <name>ProcessInfo</name>
+    <message>
+        <source>PID</source>
+        <translation>PID</translation>
+    </message>
+    <message>
+        <source>Command</source>
+        <translation>Команда</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <translation>Ова е листа на сите провеси.
+
+Килкни и задржи на процес за додатни информации, или да испратиш сигнал.</translation>
+    </message>
+    <message>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <translation>Избери сигнал и кликни на копчето Прати за да се испрати до процесот.</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Прати</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected signal to this process.</source>
+        <translation>Кликни овде за зибраниот сигнал да се испрати до процесот.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this process.</source>
+        <translation>Овде се прикажани деталн информации за процесот.</translation>
+    </message>
+    <message>
+        <source>You really want to send
+</source>
+        <translation type="obsolete">Да испрати</translation>
+    </message>
+    <message>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SystemInfo</name>
+    <message>
+        <source>System Info</source>
+        <translation>Информации за ситемот</translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation>Меморија</translation>
+    </message>
+    <message>
+        <source>Storage</source>
+        <translation>Медиум</translation>
+    </message>
+    <message>
+        <source>CPU</source>
+        <translation>Процесор</translation>
+    </message>
+    <message>
+        <source>Process</source>
+        <translation>Процесс</translation>
+    </message>
+    <message>
+        <source>Modules</source>
+        <translation>Модули</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Верзија</translation>
+    </message>
+</context>
+<context>
+    <name>VersionInfo</name>
+    <message>
+        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
+    </message>
+    <message>
+        <source>Compiled by: </source>
+        <translation>Компајлирано од:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
+    </message>
+    <message>
+        <source>Built on: </source>
+        <translation>Изградено на:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Version: </source>
+        <translation>&lt;p&gt; Верзија:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Model: </source>
+        <translation>&lt;p&gt;Модел:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Vendor: </source>
+        <translation>&lt;p&gt; Производител:</translation>
+    </message>
+    <message>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <translation>Оваа страна ја прикажува верзијата на Opie, кернелот и дистрибудиајта.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/systemtime.ts b/i18n/mk/systemtime.ts
new file mode 100644
index 0000000..b56f5dd
--- a/dev/null
+++ b/i18n/mk/systemtime.ts
@@ -0,0 +1,245 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FormatTabWidget</name>
+    <message>
+        <source>Time format</source>
+        <translation>Формат на време</translation>
+    </message>
+    <message>
+        <source>hh:mm</source>
+        <translation>сс:мм</translation>
+    </message>
+    <message>
+        <source>D/M hh:mm</source>
+        <translation>Д/М сс:мм</translation>
+    </message>
+    <message>
+        <source>M/D hh:mm</source>
+        <translation>М/Д сс:мм</translation>
+    </message>
+    <message>
+        <source>12/24 hour</source>
+        <translation>12/24 саати</translation>
+    </message>
+    <message>
+        <source>24 hour</source>
+        <translation>24 саати</translation>
+    </message>
+    <message>
+        <source>12 hour</source>
+        <translation>12 саати</translation>
+    </message>
+    <message>
+        <source>Date format</source>
+        <translation>Формат на датим</translation>
+    </message>
+    <message>
+        <source>Weeks start on</source>
+        <translation>Почеток на недела</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Недела</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Понеделник</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>SystemTime</source>
+        <translation>Системско Време</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Формат</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Predict</source>
+        <translation>Претпостави</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Баравте одложување за %1 минута, но само %2 минути поминаа по последното барање &lt;br&gt; Да продолжи?</translation>
+    </message>
+    <message>
+        <source>Continue?</source>
+        <translation>Продолжи?</translation>
+    </message>
+    <message>
+        <source>Running:
+ntpdate </source>
+        <translation>Работи: 
+ntpdate</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Грешка</translation>
+    </message>
+    <message>
+        <source>Error while getting time from network.</source>
+        <translation>Грешка при превземањето на времето од 
+мрежа.</translation>
+    </message>
+    <message>
+        <source>Error while executing ntpdate</source>
+        <translation>Грешка со ntpdate</translation>
+    </message>
+    <message>
+        <source>Time Server</source>
+        <translation>Временски Сервер</translation>
+    </message>
+    <message>
+        <source>Error while getting time from
+ server: </source>
+        <translation>Грешка при превземањето на времето од 
+сервер:</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 секунди</translation>
+    </message>
+    <message>
+        <source>Could not connect to server </source>
+        <translation>Неможе да се поврзе со сервер</translation>
+    </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
+    <message>
+        <source>Start time</source>
+        <translation>Почетно време</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>н/а</translation>
+    </message>
+    <message>
+        <source>Time shift</source>
+        <translation>Поместување на време</translation>
+    </message>
+    <message>
+        <source>New time</source>
+        <translation>Ново време</translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation>Земи време од мрежа</translation>
+    </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
+    <message>
+        <source>Predicted time drift</source>
+        <translation>Претпостави поминато време</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>Estimated shift</source>
+        <translation>Претпоставено поместување</translation>
+    </message>
+    <message>
+        <source>Predicted time</source>
+        <translation>Претпоставено време</translation>
+    </message>
+    <message>
+        <source>Shift [s/h]</source>
+        <translation>Помести [s/h]</translation>
+    </message>
+    <message>
+        <source>Last [h]</source>
+        <translation>Последно [n]</translation>
+    </message>
+    <message>
+        <source>Offset [s]</source>
+        <translation>Поместување [s]</translation>
+    </message>
+    <message>
+        <source>Predict time</source>
+        <translation>Претпостави време</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation>ПОстави претпоставено време</translation>
+    </message>
+    <message>
+        <source> s/h</source>
+        <translation>s/h</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>секунди</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsTabWidget</name>
+    <message>
+        <source>Time server</source>
+        <translation>Временски сервер</translation>
+    </message>
+    <message>
+        <source>minutes between time updates</source>
+        <translation>Минути помеѓу освежувања</translation>
+    </message>
+    <message>
+        <source>minutes between prediction updates</source>
+        <translation>минути помеѓу освежувања на претпоставки</translation>
+    </message>
+    <message>
+        <source>Display time server information</source>
+        <translation>Прикажи информации за сервер</translation>
+    </message>
+    <message>
+        <source>Display time prediction information</source>
+        <translation>Прикажи информации за претпоставки</translation>
+    </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
+    <message>
+        <source>Hour</source>
+        <translation>Саат</translation>
+    </message>
+    <message>
+        <source>Minute</source>
+        <translation>Минута</translation>
+    </message>
+    <message>
+        <source>AM</source>
+        <translation>АМ</translation>
+    </message>
+    <message>
+        <source>PM</source>
+        <translation>ПМ</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>Time zone</source>
+        <translation>Временска зона</translation>
+    </message>
+    <message>
+        <source>Get time from the network</source>
+        <translation>Земи време од мрежа</translation>
+    </message>
+    <message>
+        <source>Set predicted time</source>
+        <translation>Постави претпоставено време</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/tableviewer.ts b/i18n/mk/tableviewer.ts
new file mode 100644
index 0000000..2e59f14
--- a/dev/null
+++ b/i18n/mk/tableviewer.ts
@@ -0,0 +1,69 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
+        <translation>Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
+    </message>
+    <message>
+        <source>DataElem::setField(%1, %2) No valid type found</source>
+        <translation>ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
+    </message>
+</context>
+<context>
+    <name>TVBrowseKeyEntry</name>
+    <message>
+        <source>Reset</source>
+        <translation>Ресетирај</translation>
+    </message>
+    <message>
+        <source>key</source>
+        <translation>клуч</translation>
+    </message>
+</context>
+<context>
+    <name>TVKeyEdit_gen</name>
+    <message>
+        <source>TableViewer - Edit Keys</source>
+        <translation>Прегледувач на Табели - уреди клучеви</translation>
+    </message>
+    <message>
+        <source>Key Name</source>
+        <translation>Име на клуч</translation>
+    </message>
+    <message>
+        <source>Key Type</source>
+        <translation>Тип наклуч</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>Clear All</source>
+        <translation>Исчисти се</translation>
+    </message>
+</context>
+<context>
+    <name>TVListView</name>
+    <message>
+        <source>List View</source>
+        <translation>Преглед на листа</translation>
+    </message>
+</context>
+<context>
+    <name>TableViewerWindow</name>
+    <message>
+        <source>Table Viewer</source>
+        <translation>Прегледувач на табели</translation>
+    </message>
+    <message>
+        <source>could not load Document</source>
+        <translation>неможе да се вчита документот</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/tabmanager.ts b/i18n/mk/tabmanager.ts
new file mode 100644
index 0000000..f121cc1
--- a/dev/null
+++ b/i18n/mk/tabmanager.ts
@@ -0,0 +1,88 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AppEdit</name>
+    <message>
+        <source>Application</source>
+        <translation>Апликација</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Icon:</source>
+        <translation>Икона:</translation>
+    </message>
+    <message>
+        <source>Exec:</source>
+        <translation>Изврши:</translation>
+    </message>
+    <message>
+        <source>Comment:</source>
+        <translation>Коментар:</translation>
+    </message>
+</context>
+<context>
+    <name>TabManager</name>
+    <message>
+        <source>Message</source>
+        <translation>Порака</translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove with applications
+still in the group.</source>
+        <translation>Неможе да се отстрани додека
+апликациите се во групата.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete?</source>
+        <translation>Сигурно да се избрише?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove.</source>
+        <translation>Неможе да се отстрани.</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation>Собирање на икони...</translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation>Јазиче</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Апликација</translation>
+    </message>
+</context>
+<context>
+    <name>TabManagerBase</name>
+    <message>
+        <source>Tab Manager</source>
+        <translation>Менаџер на јазичиња</translation>
+    </message>
+    <message>
+        <source>Hierarchy</source>
+        <translation>Хиреархија</translation>
+    </message>
+</context>
+<context>
+    <name>Wait</name>
+    <message>
+        <source>Please Wait...</source>
+        <translation>Почекајте...</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/tetrix.ts b/i18n/mk/tetrix.ts
new file mode 100644
index 0000000..cb7effe
--- a/dev/null
+++ b/i18n/mk/tetrix.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>празно</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Весеи го името!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Резултати</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Поени</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ниво</translation>
+    </message>
+</context>
+<context>
+    <name>QTetrix</name>
+    <message>
+        <source>Tetrix</source>
+        <translation>Терих</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Следно</translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation>Поени</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ниво</translation>
+    </message>
+    <message>
+        <source>Removed</source>
+        <translation>Отстрането</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Старт</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/textedit.ts b/i18n/mk/textedit.ts
new file mode 100644
index 0000000..011e5a1
--- a/dev/null
+++ b/i18n/mk/textedit.ts
@@ -0,0 +1,268 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TextEdit</name>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start with new file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompt on Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always open linked file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search Bar Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>.desktop File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/tictac.ts b/i18n/mk/tictac.ts
new file mode 100644
index 0000000..9933f78
--- a/dev/null
+++ b/i18n/mk/tictac.ts
@@ -0,0 +1,48 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation>Компјутерот стартува</translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation>Човекот почнува</translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation>Играј!</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Исклучи</translation>
+    </message>
+    <message>
+        <source>Click Play to start</source>
+        <translation>Кликни Играј за старт</translation>
+    </message>
+    <message>
+        <source>Make your move</source>
+        <translation>Направи потег</translation>
+    </message>
+    <message>
+        <source>You won!</source>
+        <translation>Победа!</translation>
+    </message>
+    <message>
+        <source>Computer won!</source>
+        <translation>КОмпјутерот победи!</translation>
+    </message>
+    <message>
+        <source>It&apos;s a draw</source>
+        <translation>Нерешено</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/tinykate.ts b/i18n/mk/tinykate.ts
new file mode 100644
index 0000000..9cc60a5
--- a/dev/null
+++ b/i18n/mk/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKATE</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Ново</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Отвори</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сними</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Сними како</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Датотека</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Фонт +</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Фонт -</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Преглед</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Алатки</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Одбележување</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Подесувања</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Неименувано %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
new file mode 100644
index 0000000..97d884f
--- a/dev/null
+++ b/i18n/mk/today.ts
@@ -0,0 +1,186 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Today</name>
+    <message>
+        <source>Today</source>
+        <translation>Денес</translation>
+    </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished">Сопственост на</translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation>Пополни ја визит картата</translation>
+    </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation>Кликни овде за да се стартува асоцираната апликација</translation>
+    </message>
+    <message>
+        <source>No plugins found</source>
+        <translation>Нема додатоци</translation>
+    </message>
+    <message>
+        <source>No plugins activated</source>
+        <translation>Нема активни додатоци</translation>
+    </message>
+</context>
+<context>
+    <name>TodayBase</name>
+    <message>
+        <source>Today</source>
+        <translation>Денес</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation>денес од Maximillian ReiB</translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
+        <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfig</name>
+    <message>
+        <source>Today Config</source>
+        <translation>Конфигурација</translation>
+    </message>
+    <message>
+        <source>Load which plugins in what order:</source>
+        <translation>Вчитај додатоци по редослед:</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <translation>активирај/деактивирај додаток или користи ги стрелките за да се смени редоследод на прикажување</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Помести нагоре</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Помести надоле</translation>
+    </message>
+    <message>
+        <source>active/order</source>
+        <translation>активно/редослед</translation>
+    </message>
+    <message>
+        <source>autostart on 
+resume?
+ (Opie only)</source>
+        <translation type="obsolete">автоматско стартување на 
+продолжување?
+(само за Opie)</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="obsolete">Избери ако „Денес“ треба автомтски да се стартува.</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Мал банер</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="obsolete">минути неактивност</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="obsolete">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation type="obsolete">големина на икона</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="obsolete">Намести големина на икони</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="obsolete">Освежување</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="obsolete">Колку често треба „Денес“ да се освежува</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="obsolete">сек</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="obsolete">никогаш</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Општо</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished">Избери ако „Денес“ треба автомтски да се стартува.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished">минути неактивност</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished">Намести големина на икони</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">сек</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished">никогаш</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished">Колку често треба „Денес“ да се освежува</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
new file mode 100644
index 0000000..67a86f5
--- a/dev/null
+++ b/i18n/mk/todolist.ts
@@ -0,0 +1,614 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="obsolete">&lt;h1&gt;Аларм на %0 &lt;h1&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished">&lt;h1&gt;Аларм на %1 &lt;h1&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Information</source>
+        <translation>Информација</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Состојба</translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation>Аларми</translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation>Повторување</translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation>Внеси задача</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Уреди Задача</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation>тивок</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>Гласен</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation>Нова од поставка</translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation>Нова задала</translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation>Кликни овде за да се зададе нова задача.</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Уреди Задача</translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation>Кликни овде за да се измени задачата.</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation>Види Задача</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation>Избриши...</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation>Кликни овде за да ја отстраниш моменталната задача.</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation>Избриш се...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation>Избриши завршени</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation>Дуплирај</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation>Пренеси</translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation>Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Најди</translation>
+    </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation>Покажи завршени задачи</translation>
+    </message>
+    <message>
+        <source>Show only over-due tasks</source>
+        <translation>Покажи само задалчи со прекорачан рок</translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation>Покажи крајни рокови</translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation>Покажи палета</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation>Податоци</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation>Категорија</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Опции</translation>
+    </message>
+    <message>
+        <source>QuickEdit</source>
+        <translation>Брзо Уредување</translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation>Ова е листа на задачи.
+
+Листата ги прикажува следните информации:
+1. Завршени - одбележани со зелено.Кликни овде за да се заврши некоја задача.
+2. Приоритет - Графичка репрезентација на приоритетот на задачата. Кликни двапати за да се измени.
+3. Опис - Опис на задачата. Кликни овде за да се избере задачата.
+4. Краен рок - крајниот рок на задачата.</translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation>Сите категории</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Незапишано</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Нема простор</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation>Роковникот неможеше 
+да ги сними промените
+ослободи простор
+и обиди се повторно
+
+Прекини?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation>Роковник</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="obsolete">Неможе да се уредуваат податоци, во моментот се врши синхронизација,</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation>сите задачи?</translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation>сите завршени задачи?</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation>&lt;p&gt;%1 новаи задача. &lt;p&gt;Дали да се додадат на листата на задачи?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation>Нови задачи</translation>
+    </message>
+    <message>
+        <source>C.</source>
+        <translation>С.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation>Приоритет</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Опис</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation>Краен рок</translation>
+    </message>
+    <message>
+        <source>Configure Templates</source>
+        <translation>Подеси поставки</translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Уредувач на поставки</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Одстрани</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Име</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Нов поставка %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Кликни овде за да поставиш приоритет на нова задача.
+
+Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Внеси опис за новата задача.
+
+Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Повеќе</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Кликни овде за да се внесат додатни информации за новата задача.
+
+Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Внеси</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Додади опис новата задача.
+
+Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Кликни овде да ресетираш информации за нова задача.
+
+Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Приоритет:</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>Table View</source>
+        <translation>Преглед по табела</translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
+        <translation>%1 ден</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Ништо</translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Date</source>
+        <translation>Датум</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Време</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Тип</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Нов</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Уреди</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Description:</source>
+        <translation>Опис:</translation>
+    </message>
+    <message>
+        <source>Enter brief description of the task here.</source>
+        <translation>Внеси краток опис на задачата овде.</translation>
+    </message>
+    <message>
+        <source>Complete </source>
+        <translation>Заврши</translation>
+    </message>
+    <message>
+        <source>Work on </source>
+        <translation>Работи на</translation>
+    </message>
+    <message>
+        <source>Buy </source>
+        <translation>Купи</translation>
+    </message>
+    <message>
+        <source>Organize </source>
+        <translation>Организирај</translation>
+    </message>
+    <message>
+        <source>Get </source>
+        <translation>Земи</translation>
+    </message>
+    <message>
+        <source>Update </source>
+        <translation>Ажурирај</translation>
+    </message>
+    <message>
+        <source>Create </source>
+        <translation>Создади</translation>
+    </message>
+    <message>
+        <source>Plan </source>
+        <translation>План</translation>
+    </message>
+    <message>
+        <source>Call </source>
+        <translation>Повикај</translation>
+    </message>
+    <message>
+        <source>Mail </source>
+        <translation>Електронско писмо</translation>
+    </message>
+    <message>
+        <source>Select priority of task here.</source>
+        <translation>Избери приоритет на задача.</translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation>Многу Висок</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>ВИсока</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Нормална</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Ниска</translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation>Многу Низок</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Категорија:</translation>
+    </message>
+    <message>
+        <source>Select category to organize this task with.</source>
+        <translation>Избери категорија.</translation>
+    </message>
+    <message>
+        <source>Recurring task</source>
+        <translation>Повторувачка задача</translation>
+    </message>
+    <message>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation>Кликни овде ако задачата се повтрува. </translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="obsolete">ЗабелеШки:</translation>
+    </message>
+    <message>
+        <source>Enter any additional information about this task here.</source>
+        <translation>Овде внеси додатни информации за задачата.</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Листа на задачи</translation>
+    </message>
+    <message>
+        <source>Summary:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorStatus</name>
+    <message>
+        <source>Status:</source>
+        <translation>Статус:</translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
+        <translation>Моментална состојба на задачата.</translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation>Почнат</translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation>Одложено</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Завршен</translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation>Не е почнат</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Напредок:</translation>
+    </message>
+    <message>
+        <source>Select progress made on this task here.</source>
+        <translation>Избери ниво на напредок.</translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation>0 %</translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation>20 %</translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation>40 %</translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation>60 %</translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation>80 %</translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation>100 %</translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation>Почетен датум:</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was started.</source>
+        <translation>Намести датум кога е започната задачата.</translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation>Краен рок:</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation>Краен рок.</translation>
+    </message>
+    <message>
+        <source>Completed:</source>
+        <translation>Завршено:</translation>
+    </message>
+    <message>
+        <source>Click here to mark this task as completed.</source>
+        <translation>Означи ја задачата како завршена.</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was completed.</source>
+        <translation>Намести го датумот на завршување на задачата.</translation>
+    </message>
+    <message>
+        <source>Maintainer Mode:</source>
+        <translation>МОд на одржување:</translation>
+    </message>
+    <message>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation>Намести ја улогатана одржувачот.</translation>
+    </message>
+    <message>
+        <source>Nothing</source>
+        <translation>Ништо</translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation>Одговорен</translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation>Завршен од</translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation>Координирање</translation>
+    </message>
+    <message>
+        <source>Maintainer:</source>
+        <translation>Одржувач:</translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation>Име на раководителот на проектот.</translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation>тест</translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation>Избери одржувач на задачата.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/ubrowser.ts b/i18n/mk/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/mk/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/usermanager.ts b/i18n/mk/usermanager.ts
new file mode 100644
index 0000000..31ad163
--- a/dev/null
+++ b/i18n/mk/usermanager.ts
@@ -0,0 +1,35 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GroupDialog</name>
+    <message>
+        <source>Add Group</source>
+        <translation>Додади група</translation>
+    </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Уреди група</translation>
+    </message>
+</context>
+<context>
+    <name>UserConfig</name>
+    <message>
+        <source>OPIE User Manager</source>
+        <translation type="obsolete">OPIE менаџер на корисници</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UserDialog</name>
+    <message>
+        <source>Add User</source>
+        <translation>Додади корисник</translation>
+    </message>
+    <message>
+        <source>Edit User</source>
+        <translation>уреди Корисник</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/wordgame.ts b/i18n/mk/wordgame.ts
new file mode 100644
index 0000000..69ee7f0
--- a/dev/null
+++ b/i18n/mk/wordgame.ts
@@ -0,0 +1,133 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Board</name>
+    <message>
+        <source>Blanks: </source>
+        <translation>Празни:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ок</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Откажи</translation>
+    </message>
+    <message>
+        <source>Unknown word</source>
+        <translation>Непознат збор</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
+        <translation>&lt;p&gt; Зборот „%1“ не е во речникот.</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додај</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Игнорирај</translation>
+    </message>
+</context>
+<context>
+    <name>NewGameBase</name>
+    <message>
+        <source>Players</source>
+        <translation>Играчи</translation>
+    </message>
+    <message>
+        <source>AI3: Smart AI player</source>
+        <translation>ВИ3: Паметен играч со ВИ</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Правила</translation>
+    </message>
+    <message>
+        <source>&amp;Start</source>
+        <translation>&amp;Старт</translation>
+    </message>
+</context>
+<context>
+    <name>RulesBase</name>
+    <message>
+        <source>Game Rules</source>
+        <translation>Правила на Игра</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <source>Board</source>
+        <translation>Табла</translation>
+    </message>
+    <message>
+        <source>Size:</source>
+        <translation>Големина:</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation>Уреди...</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Избриши</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;ОК</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Откажи</translation>
+    </message>
+</context>
+<context>
+    <name>ScoreInfo</name>
+    <message>
+        <source>&lt;P&gt;Invalid move</source>
+        <translation>&lt;p&gt; Невалиден потег</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Score: </source>
+        <translation>&lt;p&gt; Резултат:</translation>
+    </message>
+</context>
+<context>
+    <name>WordGame</name>
+    <message>
+        <source>Word Game</source>
+        <translation>Игра на зборови</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Завршено</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Затвори</translation>
+    </message>
+    <message>
+        <source>End game</source>
+        <translation>Крај на игра</translation>
+    </message>
+    <message>
+        <source>Do you want to end the game early?</source>
+        <translation>Дали да се заврши играта?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Да</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Не</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/.directory b/i18n/nl/.directory
index 00fe708..d39fb8d 100644
--- a/i18n/nl/.directory
+++ b/i18n/nl/.directory
@@ -1,6 +1,9 @@
 [Desktop Entry]
 Name=Dutch
+Name[nl]=Nederlands
+Name[da]=Hollandsk
 Name[de]=Niederländisch
+Name[it]=Olandese
 Name[pt]=Holandês
 Name[pt_BR]=Holandês
 Name[sl]=Nizozemščina
diff --git a/i18n/nl/addressbook.ts b/i18n/nl/addressbook.ts
index 6ff398d..5864e4a 100644
--- a/i18n/nl/addressbook.ts
+++ b/i18n/nl/addressbook.ts
@@ -1,1515 +1,1519 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Volledige naam</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Kies</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Schrijf mail aan</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Stuur via IR</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Wijzig persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Wijzig adres</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacten - Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Geen ruimte</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
-        <translation>Kan niet opslaan
+        <translation>Kan niet opslaan.
 Maak ruimte en probeer het opnieuw.
 
 Toch stoppen?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongeklassificeerd</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importeer vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Sluit Vind</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Sla alles op</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configureer</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Niet gevonden</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lijst</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kaartjes</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kaart</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Start zoeken</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Juist bestandstype?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
         <source>Unable to find a contact for this 
  search pattern!</source>
-        <translation>Kan niets vinden dat voldoet
+        <translation type="obsolete">Kan niets vinden dat voldoet
  aan de zoekterm!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Het geselecteerde bestand 
  eindigt niet op &quot;.vcf&quot;.
  Wilt u het alsnog openen?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Contact toevoegen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wilt U inderdaad een contact
 toevoegen voor %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp; Ja op alles</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exporteer vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation>Je moet een contact selecteren!</translation>
+        <translation>U moet een contact selecteren!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation>Je moet een bestandsnaam selecteren!</translation>
+        <translation>U moet een bestandsnaam selecteren!</translation>
+    </message>
+    <message>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>Kan geen kontakt vinden met dit zoekpatroon!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Verzoekstijl</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Gebruik reguliere expressies</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Gebruik jokertekens (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Gebruik QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Gebruik Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Opmerking: QT-Mail is
 alleen voorhanden in de
 SHARP standaard ROM.
 Opie-Mail wordt gratis
 geleverd!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Zoekopties</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Volgorde</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Kies contactvolgorde:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Omhoog</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Klik op tab om te selecteren</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Opties voor de zoekstijl</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Zoekelement verwacht reguliere expressies als die zijn geselecteerd</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Zoekelement verwacht alleen jokertekens</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Indien geselecteerd, hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Fontgrootte voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Fontsettings voor lijst- en kaartweergave</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Gebruik Sharp&apos;s mailprogramma indien beschikbaar</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Gebruik Opie mail indien geinstalleerd</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omhoog</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Verplaats geselecteerd kenmerk een plaats omlaag</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Lijst van alle mogelijke kenmerken</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Voeg geselecteerd kenmerk toe van onderstaande lijst aan de bovenste lijst </translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Verwijder geselecteerd kenmerk uit de bovenste lijst</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation>Volgorde (op -&gt; neer) regelt wie het eerst wordt weergegeven in de tweede kolom in de lijstweergave</translation>
+        <translation>Volgorde (op -&gt; neer) regelt wat het eerst wordt weergegeven in de tweede kolom in de lijstweergave</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Gereedschap-/Menubalk</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Vast</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar vaste gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Verplaatsbaar</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Schakel over naar verplaatsbare gereedschap-/menubalk na het wisselen van programma!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Toevoeging</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functie</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Woonplaats</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Provincie</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Land</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Volledige naam...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organisatie</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Privé</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Postcode</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Verenigde Staten</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Verenigd Koninkrijk</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japan</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Frankrijk</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Duitsland</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noorwegen</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Maak notitie</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Wijzig naam</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanië</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algerije</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Amerikaans Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentinië</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Australië</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Oostenrijk</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeidzjan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahama&apos;s</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrein</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>België</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda&apos;s</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvet Eiland</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazilië</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarije</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Kaapverdische Eilanden</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kaaiman Eilanden</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chaad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chili</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Paaseiland</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colombia</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoren</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Cook Eiland</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Ivoorkust</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Kroatië</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Cyprus</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Tsjechische Republiek</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Denemarken</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominicaanse Republiek</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Oost Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ecuador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egypte</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Equatoriaal Guinee</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estland</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Ethiopië</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falkland Eilanden</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroe Eilanden</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finland</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Frans Guyana</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Frans Polynesië</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Greorgië</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Griekenland</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Groenland</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guinee</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Guyana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haïti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hongarije</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>IJsland</translation>
     </message>
     <message>
         <source>India</source>
         <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonesië</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Ierland</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israël</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italië</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordanië</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Litouwen</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
-        <translation>Macedonië</translation>
+        <translation>Macedonië</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Maleisië</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Malediven</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauretanië</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>Mexico</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronesië</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>Moldavië</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Monaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongolië</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marokko</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Mozambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namibië</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Nederland</translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation>Nieuw Caledonië</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nieuw Zeeland</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicaragua</translation>
     </message>
     <message>
         <source>Niger</source>
         <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigerië</translation>
     </message>
     <message>
         <source>Niue</source>
         <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
         <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation>Papua Nieuw Guinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguay</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Fillipijnen</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polen</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Puerto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation>Quatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roemenië</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rusland</translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation>Santa Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Saudi Arabië</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seychellen</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapore</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Slowakijë</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Slovenië</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation>Solomon Eilanden</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somalië</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>Zuid-Afrika</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Spanje</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Zweden</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Zwitserland</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation>Tajikistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Thailand</translation>
     </message>
     <message>
         <source>Togo</source>
         <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunesië</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turkije</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Oekraine</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguay</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation>Oezbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation>Maagdeneilanden</translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation>Westelijke Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Joegoslavië</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>Koeweit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation>Afghanistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation>Antartica</translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation>Armenië</translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation>Bolivia</translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation>Kameroen</translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation>Guadeloupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation>Guinee-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation>Kirgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestijnse autonome gebieden</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Eilanden</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Druk hier om volledige naam in te vullen</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Vul de hele naam direct in! Als een achternaam met meerdere woorden moet worden ingevuld (bijvoorbeeld &quot;de Vries&quot;), schrijf dan &lt;achternaam&gt;, &lt;voornamen&gt; zoals dit: &quot;de Vries, Peter Paul&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>De functienaam..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Iets als &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>De plaats waar het contact werkt</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Druk om het te veranderen kenmerk te selecteren</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Druk hier om te selecteren hoe de naam opgeslagen(en weergegeven in de lijst) moet worden</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
         <translation>Telefoon werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobiel werk</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Standaard email</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefoon prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobiel prive</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinderen</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functie</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Bedrijf adres</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Bedrijf woonplaats</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Bedrijf provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Bedrijf Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Bedrijf land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Bedijf pieper</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Bedrijf website</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Prive adres</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Prive woonplaats</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Prive provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Prive postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Prive land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Prive website</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/advancedfm.ts b/i18n/nl/advancedfm.ts
index ccf94aa..5747db3 100644
--- a/i18n/nl/advancedfm.ts
+++ b/i18n/nl/advancedfm.ts
@@ -1,314 +1,389 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Notitie</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Deze map bestaat niet</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 copyright 2002-2003
 L.J.Potter &lt;llorncor@handhelds.org&gt;
-en is valt onder de GPL</translation>
+en valt onder de GPL</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Vertoon verborgen bestanden</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Verander van map</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Voer uit</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Open als tekst</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akties</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Maak map</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Maak symbolische link</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Hernoem</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation>Kopieer</translation>
+        <translation>Kopiëer</translation>
     </message>
     <message>
         <source>Copy As</source>
-        <translation>Kopieer als</translation>
+        <translation>Kopiëer als</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
-        <translation>Kopieer in zelfde map</translation>
+        <translation>Kopiëer in zelfde map</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Verplaats</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Voeg toe aan Documenten</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Voer commando uit</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Bestandsinfo</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Stel bevoegdheden in</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Verzend bestand via IR</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!!</source>
-        <translation>Kan huidige directory niet
+        <translation type="obsolete">Kan huidige directory niet
 uit favorieten verwijderen,
 er is hier geen favoriet van!</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Voer commando uit met uitvoer</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Selecteer alles</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Schakel naar lokaal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Schakel naar server</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Maak favoriet van map</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Verwijder huidige map uit favorieten</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation>%1 beatanden
+        <translation>%1 bestanden
 echt verwijderen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Verwijder map?</translation>
     </message>
     <message>
         <source>Really delete
 </source>
-        <translation>Echt verwijderen
+        <translation type="obsolete">Echt verwijderen
 </translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>%1 bestanden
 echt kopiëren?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Bestand bestaat al!</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 Bestaat al, Overschrijven?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Kon %1 niet naar %2 kopiëren</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>bestaat. Overschrijven?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation>Kan niet kopiëeren</translation>
+        <translation>Kan niet kopiëren
+</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>naar</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Kopiëer</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Als</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>bestaat al.
 Wilt u het echt verwijderen?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Kan niet verplaatsen
 </translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>AdvancedFm Uitvoer</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>AdvancedFm IR uit</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR verzonden.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kan bestand niet hernoemen</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">AdvancedFM ::</translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete">kB vrij</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation>Kan huidige map niet verwijderen
+van favorietenlijst.
+Er is geen favoriet van!</translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation>Bestand zoeken</translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>%1 en alle inhoud
+echt verwijderen?</translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation>%1
+echt verwijderen?</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">Kopiëer &apos;%1&apos; als</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sla uivoer op in bestand (alleen bestandsnaam)</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Proces kon niet worden gestart</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Fout
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Klaar
+</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Stel bestandspermissies in</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Stel bestandspermissies in voor:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eigenaar</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groep</translation>
     </message>
     <message>
         <source>others</source>
         <translation>iedereen</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Eigenaar</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
     <message>
         <source>read</source>
         <translation>Lezen</translation>
     </message>
     <message>
         <source>write</source>
         <translation>Schrijven</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Uitvoeren</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Waarschuwing</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Fout - geen gebruiker</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Fout - geen groep</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Fout bij instellen van eigenaar of groep</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Fout bij instellen modus</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/appearance.ts b/i18n/nl/appearance.ts
index 04a3c97..0ccd282 100644
--- a/i18n/nl/appearance.ts
+++ b/i18n/nl/appearance.ts
@@ -1,285 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Stijlen regelen de manier waarop knoppen en schuifbalken in alle programma&apos;s worden weergegeven.
 
 Klik hier om een stijl te selecteren.</translation>
     </message>
     <message>
         <source>Settings...</source>
         <translation>Instellingen...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klik hier om de momenteel geselecteerde stijl in te stellen.
 
 Let op: Deze optie is niet beschikbaar voor alle stijlen.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vensterdecoratie verzorgt de manier waarop de titelbalk en knoppen van een programma
 worden weergegeven.
 Klik hier om een beschikbare decoratie te kiezen.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>Selecteer het gewenste font, stijl en tekengrootte dat standaard moet worden gebruikt.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>Kleurschema&apos;s zijn een set kleuren die worden gebruikt door de diverse delen van het scherm.
 
 Klik hier om een kleurschema te kiezen.</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>Huidig schema</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Pas aan....</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klik hier om de kleuren in het huidige schema te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klik hier om het links aangegeven kleurschema te verwijderen.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sla op</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klik hier om het huidige schema onder een naam op te slaan.</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>Verplicht schema voor alle programma&apos;s.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
         <translation>Klik hier om toe te staan dat alle programma&apos;s de algemene stijlinstellingen gebruiken.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>Zet stijlinstellingen uit voor deze programma&apos;s (&lt;b&gt;*&lt;/b&gt; kunnen worden gebruikt als jokertekens):</translation>
+        <translation>Zet stijlinstellingen uit voor deze programma&apos;s (&lt;b&gt;*&lt;/b&gt; kan worden gebruikt als jokerteken):</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>Als sommige applicaties niet goed werken met de algemene stijlinstellingen, kunt u hier onderdelen ervan uitschakelen voor dat programma.
 
-Dit gedeelte geeft de mogelijkheid een programma te selecteren en de uit te schakelen instellinen te kiezen.</translation>
+Dit gedeelte geeft de mogelijkheid een programma te selecteren en de uit te schakelen instellingen te kiezen.</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>Binaire bestanden</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
         <translation>Klik hier om een programma aan de lijst hierboven toe te voegen.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
         <translation>Klik hier om het geselecteerde programma te verwijderen.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
         <translation>Klik hier om het geselecteerde programma hoger in de lijst te zetten.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation>Klik hier om het geselecteerde programma hoger in de lijst te zetten.</translation>
+        <translation>Klik hier om het geselecteerde programma lager in de lijst te zetten.</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>Tab stijl:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klik hier om de gewenste stijl voor programa&apos;s met tabbladen(zoals deze) te kiezen. De bechikbare stijlen zijn:
 
 1. Tabbladen - Normale tabbladen met alleen tekstlabels
 2. Tabbladen met iconen - Tabbladen met iconen voor ieder tabblad, tekst verschijnt alleen bij huidig tabblad.
 3. Keuzelijst - Een verticale opsomming van de bladen
 4. Keuzelijst met iconen - Een verticale opsomming van de bladen met iconen</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Tabbladen met Iconen</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Keuzelijst</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Keuzelijst met iconen</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Boven</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik hier om tabs bovenaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Onder</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik hier om tabs onderaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotatierichting:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Weergaveinstellingen</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dit is een voorbeeldvenster. Kijk hier om te zien hoe de weergave verandert als instellingen worden gewijzigd.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stijl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vensters</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>Herstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation>Wil je %1 nu herstarten?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Sla Schema op</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Sla schema op</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
-        <translation>Scema bestaat al.</translation>
+        <translation>Schema bestaat al.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Verwijder schema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kan huidig schema niet verwijderen.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nieuw&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Wijzig schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik hier om een kleur te kiezen voor:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Voorbeeld</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normaal item</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>Uitgeschakeld Item</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>Normale tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>Gemakeerde tekst</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>Knop</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>Selectievakje</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>Voorbeeldvenster met de geselecteerde instellingen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/appskey.ts b/i18n/nl/appskey.ts
deleted file mode 100644
index b6f19ae..0000000
--- a/i18n/nl/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Definieer programmatoets</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Adresboek</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Thuis</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Popup menu</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Mail</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Kalender</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/nl/aqpkg.ts b/i18n/nl/aqpkg.ts
index efb1643..7838210 100644
--- a/i18n/nl/aqpkg.ts
+++ b/i18n/nl/aqpkg.ts
@@ -1,565 +1,696 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Kategoriefilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Selecteer een of meer groepen</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lees Configuratie....</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancel</translation>
+        <translation>&amp;Annuleer</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Remove
 </source>
         <translation>Verwijder
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Installeer</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Vernieuw
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Herinstallatie)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Vernieuw)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Doel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>Ruinte Besch.</translation>
+        <translation>Beschikbare ruimte</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Afbreken</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Gebruiker drukte op AFBREKEN ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Bewerking Afgebroken ****</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Sla utivoer op</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 kB</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forceer Afhankelijkheden</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forceer Herinstallatie</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Forceer Verwijderen</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Forceer Overschrijven</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Informatieniveau</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Alleen Fouten</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normale berichten</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informatieve berichten</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Foutopsporingsuitvoer</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>Verwerken van pakket %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>Verwijderen van symbolysche links...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>Maak symbolische links aan voor %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>Maak symbolische links aan voor %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Klaar</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>Verwijder status info...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>statusbestand - </translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>pakket - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Kan statusbestand niet openen - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Kan tijdelijk statusbestand niet maken - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>Kan ipkg proces niet starten</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>Kan niet openen:</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>Maak map aan</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Link gemaakt van %1 naar %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Link van %1 naar %2 mislukt</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>Verwijderd %1</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>%1 verwijderen mislukt</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Verwijderd</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Verwijderen mislukt</translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Pakketmanager</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Typ hier de te zoeken tekst.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Klik hier on de Quick Jump werkbalk te verbergen.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Vernieuw lijsten</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Klik hier om de pakketlijsten van de server te vernieuwen.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Klik hier om alle geinstaleerde pakketten te vernieuwen als er een nieuwere versie is.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Download</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Klik hier on de momenteel geselecteerde pakketten op te halen.</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Voer uit</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde pakketten te installeren, verwijderen of vernieuwen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akties</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Laat niet geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Klik hier om beschikbare pakketten te laten zien die niet geinstallerd zijn.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Laat geinstalleerde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Klik hier om de momenteel geinstalleerde paketten te zien.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Laat vernieuwde paketten zien</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Klik hier om geinstalleerde pakketten te laten zien waar een nieuwere versie van beschikbaar is.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter op kategorie</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Klik hier om paketten te laten zien die tot een kategorie behoren.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Stel kategoriefilter in</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Klik hier om pakket-filtercategorie te wijzigen.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Klik hier om te zoeken op tekst in pakketnamen.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Klik hier om het volgende pakket te zoeken die aan de zoektekst voldoet.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Quick Jump toetsenblok</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Klik hier om het toetsenblok te laten zien/verbergen om snelle toegang tot de pakketlijst mogelijk te maken. </translation>
     </message>
     <message>
         <source>View</source>
         <translation>Aanzicht</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation>Klik hier om de Zoek balk te verbergen.</translation>
+        <translation>Klik hier om de zoekbalk te verbergen.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Servers:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Klik hietr om een pakketbron te kiezen.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Pakketten</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Dit is een lijst met alle paketten van de bovenstaande server.
 
 Een blauw bolletje naast de naam geeft aan dat het pakket momenteel is geinstalleerd.
 
 Een blauw bolletje met een ster geeft aan dat er een nieuwere versie van dit pakket beschikbaar is.
 
 Vink het vakje aan de linkerkant aan om een pakket te selecteren.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klik hier om de momenteel geselecteerde paketten te verwijderen.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Bouw serverlijst op voor:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Ververs serverpakketlijsten</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>WAARSCHUWING: Upgraden
 terwijl Opie/Qtopia draait
 is NIET aanbevolen!
 
 Weet u het zeker?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Waarschuwing</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Vernieuwen geinstalleerde paketten</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Bent u zeker van het verwijderen van
 pakket %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Weet u het zeker?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation>Waarheen Downloaden</translation>
+        <translation>Waarheen downloaden</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vul pad om naartoe te downloaden in</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation>Installeer Remote Pakket</translation>
+        <translation>Installeer pakket van server</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Voer pakketlocatie in</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Niets te doen</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation>Geen paketten geselecteerd</translation>
+        <translation>Geen pakketten geselecteerd</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
-        <translation>Wilt u verwijdering of herinstalatie van
+        <translation>Wilt u verwijdering of herinstallatie van
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
-        <translation>Verwijdering of Herinatallatie</translation>
+        <translation>Verwijdering of Herinstallatie</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Herinstalleer</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>R</translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Wilt u verwijdering of vernieuwing van
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
-        <translation>Verwijdering of vernieuwing</translation>
+        <translation>Verwijdering of Vernieuwing</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>U</translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Vernieuwen Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Omschrijving&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Geinstalleerd naar&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Grootte&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Sectie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Bestandsnaam&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Geinstalleerde Versie&lt;/b&gt; -</translation>
+        <translation>&lt;p&gt;&lt;b&gt;Geinstalleerde versie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation>&lt;p&gt;&lt;b&gt;Beschikbare Versie&lt;/b&gt; -</translation>
+        <translation>&lt;p&gt;&lt;b&gt;Beschikbare versie&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Pakketinformatie</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Pakketinformatie is niet beschikbaar</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Sluit</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Geinstalleerde pakketten</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Lokale pakketten</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>n/b</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Pakket - %1
+            versie - %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>
+            inst versie - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>Versiestring is leeg.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>Tekst in versie is geen nummer.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Geen versienummer na de punt.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servers</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Doelen</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktieve Server</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Vernieuw</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Doel</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Link naar Root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Ingeschakeld</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Gebruikersnaam:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/backgammon.ts b/i18n/nl/backgammon.ts
index 4eb9e18..4b0f8ad 100644
--- a/i18n/nl/backgammon.ts
+++ b/i18n/nl/backgammon.ts
@@ -1,2 +1,170 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Redden&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Slaan&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Openstellen&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Bescherm&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Veilig&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Leeg&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Standaardwaarden</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Help</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Haal de stukken uit de eindzone</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Sla een stuk van de tegenstander</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Stel je eigen stukken open.
+Na deze zet zal er maar een steen op deze plek blijven staan</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Bescherm een enkel stuk
+door er een extra bij te zetten</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Verplaats stuk naar een plek
+die al ingenomen wordt door de speler</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Verplaats een stuk naar een lege plek</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Houd de ? knop naast een
+veld ingedrukt voor hulp</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Laad</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Sla op</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Spel</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Standaard</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Thema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Speler</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>AI</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regels</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>thema %1 is verwijderd?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleer</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Laad thema</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;geen zet&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Speler 1 wint. Klik op het bord voor een nieuw spel.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Speler 2 wint. Klik op het bord voor een nieuw spel.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>Sp2 aan de beurt</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>Sp1 aan de beurt</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/backup.ts b/i18n/nl/backup.ts
index 4fdd25a..cbe7745 100644
--- a/i18n/nl/backup.ts
+++ b/i18n/nl/backup.ts
@@ -1,52 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Backup en herstel, voortgang....</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Backup en herstel</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>Fout van systeem:
+</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>Backup mislukt!</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Details</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>Backup en Herstel is mislukt!</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Backup succesvol.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>Selecteer iets om te herstellen.</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>Herstel mislukt.</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Kan bestand %1 niet openen</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>Herstel sucsesvol.</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Backup en herstel</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Opslaan in</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Herstel</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Selecteer bron</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolom 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
-        <translation>&amp;Herstel</translation>
+        <translation>He&amp;rstel</translation>
+    </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Bestandenlijst vernieuwen</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>Foutinformatie</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>Foutomschrijving:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/bounce.ts b/i18n/nl/bounce.ts
index 159e641..3166b43 100644
--- a/i18n/nl/bounce.ts
+++ b/i18n/nl/bounce.ts
@@ -1,107 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Stuiters</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nieuw spel</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Pauze</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Over</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spel</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Score: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Levens: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Gevuld: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Tijd: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Stuiters Level %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Score: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Spel gepauzeerd.
 Druk P om door te gaan!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>Game Over!
 Score: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Tijd: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Levens: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Gevuld: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Gevuld: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Succesvol meer dan 75% gevuld.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 punten: 15 punten per leven
 </translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 punten: Bonus
 </translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 punten: Totale score
 </translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>Door naar level %1.
 Je krijgt %2 levens erbij deze keer!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>Over</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Geschreven door: Stefan Schimanski
+Geport door: Martin Imobersteg
+
+Klik om muren te vormen.
+Druk op spatie om de richting te veranderen.
+Probeer de vrije ruimte te verminderen met 75%.
+
+Dit programma wordt gedistribueeerd onder
+de voorwaarden van de GPL v2.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/checkbook.ts b/i18n/nl/checkbook.ts
index d775fe4..0a58324 100644
--- a/i18n/nl/checkbook.ts
+++ b/i18n/nl/checkbook.ts
@@ -1,519 +1,523 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nieuw Kasboek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacties</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafieken</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beveilig</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik hier om beveiliging van dit kasboek aan/uit te schakelen.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geef hier naam van het kasboek in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Geeft hier het type kasboek in.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Spaargeld</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>Belastingen</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Aandelen</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Anders</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Voer hier de naam van de bank in.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Rekeningnummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Voer het bankrekeningnummer van dit kasboek in.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN Code:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Voer hier uw PINcode van dit kasboek in.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Voer hier het startsaldo voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Voer hier verdere info voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Huidig saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Dt veld geeft het huidige saldo van dit kasboek weer.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>Dit is een lijst van alle ingevoerde transacties van dit kasboek.
 
 Klik op de kolomnaam om te sorteren op een bepaald veld. </translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik hier om een nieuwe transactie in te voeren.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Selecteer een transactie, en klik hier om dze te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Selecteer een transactie, en klik hier om deze te verwijderen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Selecteer hieronder de gewenste grafiek, en druk op de Teken knop.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik hier om het grafiektype te kiezen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kasboeksaldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Opnames per kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Inleggingen per kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Teken</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik hier om de geselecteerde grafiek te tekenen.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Huidig saldo %1%2</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer hier a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bevestig hier a.u.b. uw wachtwoord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Voer hier uw wachtwoord in om verwijdering van wachtwoord te bevestigen:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Verwijder transactie</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigureer Kasboek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geef valutasymbool in:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geef hier uw gewenste valutasymbool in.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Laat zien of het kasboek beveiligd is</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven dat het kasboek wel of niet met een wachtwoord beveiligd is.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Laat kasboeksaldo&apos;s zien</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven wat van ieder kasboek het huidige saldo is.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik hier om een nieuw kasboek te maken.
 
 U kunt ook Nieuw kiezen uit het Kasboek menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Selecteer een kasboek en klik hier om het te wijzigen.
 
 U kunt ook Wijzig uit het Kasboek menu kiezen, of de kasboeknaam ingedrukt houden.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Selecteer een kasboek en klik hier om het te verwijderen.
 
 U kunt ook Verwijder uit het Kasboek menu kiezen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dit is een lijst van alle nu aanwezige kasboeken.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kasboeknaam</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Kasboek</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transactie voor</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Opname</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Selecteer hier of de transactie een opname of een bijboeking is.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Bijboeking</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Selecteer hier de datum van de transactie.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Voer hier het kasboeknummer in.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Voer hier de omschrijving van de transactie in.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Voer hier de transactiekategorie in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Selecteer hier het transactietype.
 
 De opties die worden weergegeven zijn erop gebaseerd of dit een bijboeking of een opname is.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Voer hier het bedrag van de transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Onkosten:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Voer hier de onkosten van deze transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Voer hier extra informatie over de transactie in.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Auto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Vaste lasten</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CD&apos;s</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Kleding</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVD&apos;s</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Electronica</translation>
+        <translation type="obsolete">Electronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Amusement</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Eten/Drinken</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Benzine</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Overig</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Films</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Huur</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reizen</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Rente op leningen</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Overboekingen</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Credit Card</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Familie</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Diverse inkomsten</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Autom. Betalingen</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contant</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Electronisch</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/clock.ts b/i18n/nl/clock.ts
index 0945e59..cbb5051 100644
--- a/i18n/nl/clock.ts
+++ b/i18n/nl/clock.ts
@@ -1,93 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Sluimer</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Klok</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Stopwatch</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Stel alarm in</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Stel datum en tijd in.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarm staat aan</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarm staat aan</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Klok: Alarmtijd is verstreken</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarm ingesteld op: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Stel alarm in</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Uur</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuut</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>MP3 alarm</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Sluimertijd (minuten)</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Geluid</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index 0fa9931..14da3fc 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -1,824 +1,888 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Weeklijst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Wijzig...</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Afspraakduur is mogelijk langer
 dan tijd tussen herhalingen.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan nu data niet wijzigen door synchronisatie</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Kopieer afspraak</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Wijzig afspraak</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Geen ruimte</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender kon uw wijzigingen
 niet opslaan.
 Maak ruimte vrij en probeer het nogmaals.
 
 Toch afsluiten?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Onbekend)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fout!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Verbeter</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Ga door</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>foutenscherm</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00 u</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Verzend deze gebeurtenis</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Aanzichten</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Standaard aanzicht:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Weeklijst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Spring naar huidig moment</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Rij stijl:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Tijdweergave</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Start-Eind</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Div</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Alarminstelling</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarmvoorinstelling</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Start afspraken bekijken </translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Aanvangstijd:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinst.</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>MDWDVZZM
+
+Weekdagen</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
-        <translation>M
+        <translation type="obsolete">M
 
 Maandag</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
-        <translation>D
+        <translation type="obsolete">D
 
 Dinsdag</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
-        <translation>W
+        <translation type="obsolete">W
 
 Woensdag</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
-        <translation>D
+        <translation type="obsolete">D
 
 Donderdag</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
-        <translation>V
+        <translation type="obsolete">V
 
 Vrijdag</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
-        <translation>Z
+        <translation type="obsolete">Z
 
 Zaterdag</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
-        <translation>Z
+        <translation type="obsolete">Z
 
 Zondag</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
+    <message>
+        <source>Mo</source>
+        <comment>Monday</comment>
+        <translation type="obsolete">Ma</translation>
+    </message>
+    <message>
+        <source>Tu</source>
+        <comment>Tuesday</comment>
+        <translation type="obsolete">Di</translation>
+    </message>
+    <message>
+        <source>We</source>
+        <comment>Wednesday</comment>
+        <translation type="obsolete">Wo</translation>
+    </message>
+    <message>
+        <source>Th</source>
+        <comment>Thursday</comment>
+        <translation type="obsolete">Do</translation>
+    </message>
+    <message>
+        <source>Fr</source>
+        <comment>Friday</comment>
+        <translation type="obsolete">Vr</translation>
+    </message>
+    <message>
+        <source>Sa</source>
+        <comment>Saturday</comment>
+        <translation type="obsolete">Za</translation>
+    </message>
+    <message>
+        <source>Su</source>
+        <comment>Sunday</comment>
+        <translation type="obsolete">Zo</translation>
+    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Eindtijd</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Herhaal...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagelijks...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wekelijks...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Maandelijks...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jaarlijks...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nieuwe afspraak</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Plaats</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Vergadering</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Lunch</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Diner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reis</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Eind</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tijdzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Luid</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Herhaal</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opmerking...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Wijzig opmerking</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>De %1 %1 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>th</source>
         <translation>de</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Geen herhaling</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dag(en)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>weken</translation>
     </message>
     <message>
         <source>week</source>
         <translation>week</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source> and </source>
         <translation>en</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 en</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, en</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>om</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Herhalende afpraak</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>Eindig 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>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>maanden</translation>
     </message>
     <message>
         <source>years</source>
         <translation>jaren</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/drawpad.ts b/i18n/nl/drawpad.ts
index 194231d..21efa7c 100644
--- a/i18n/nl/drawpad.ts
+++ b/i18n/nl/drawpad.ts
@@ -1,440 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Verwijder alle</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importeer</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importeer...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exporteer</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exporteer...</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Miniatuurweergave</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Miniatuurweergave...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Paginainformatie</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Paginainformatie...</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-aliassen</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Gereedschappen</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nieuwe pagina</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Klik hier om een nieuw vel toe te voegen.</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Maak pagina leeg</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Klik hier om de pagina leeg te maken.</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Verwijder pagina</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Klik hier om de huidige pagina te verwijderen.</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Herstel</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>Klik hier om de laatste wijziging te herstellen.</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Opnieuw</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>Klik hier om de laatste wijziging opnieuw te doen.</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Eerste pagina</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>Klik hier om de eerste pagina te bekijken.</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Vorige pagina</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>Klik hier om de vorige pagina te bekijken.</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Volgende pagina</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>Klik hier om de volgende pagina te bekijken.</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Laatste pagina</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>Klik hier om de laatste pagina te bekijken.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>Klik hier om een van de gereedschappen te kiezen om lijnen te maken.</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Teken punt</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Teken lijn</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>Klik hier om een van de gereedschappen te kiezen om rechthoeken te maken.</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Teken rechthoek</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Teken gevulde rechthoek</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>Klik hier om een van de gereedschappen te kiezen om ellipsen te maken.</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Teken ellips</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Teken gevulde ellips</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Voeg tekst in</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>Klik hier om het tekstgereedschap te kiezen.</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Vul op</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>Klik hier om het vulgereedschap te kiezen.</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Verwijder punt</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>Klik hier om het verwijdergereedschap te kiezen.</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Pendikte</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>Klik hier om de pendikte te kiezen.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>Klik hier om de tekenkleur te kiezen.</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Penkleur</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>Klik hier om de vulkleur te kiezen.</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Vulkleur</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Wilt u de huidige pagina
 legen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Wilt i de huidige pagina
 verwijderen?</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>DrawPad - Pagina %1/%2</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Wilt u alle pagina&apos;s
 verwijderen?</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation>DrawPad - Exporteer</translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation>Paginaselectie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Huidige</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Reeks</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Tot:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Exporteer als</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Formaat:</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Alle plaatjes</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
         <translation>DrawPad - Importeer</translation>
     </message>
     <message>
         <source>Automatic preview</source>
         <translation>Automatisch voorbeeld</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Voorbeeld</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Alle plaatjes</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nieuwe pagina</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Breedte:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hoogte:</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Achtergrond</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Wit</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Penkleur</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Vulkleur</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Paginainformatie</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Titel:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Breedte:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Hoogte:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Titel: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Afmetingen: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Datum: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Voeg tekst in</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>DrawPad - Miniatuurweergave</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Klik hier om een nieuwe pagina toe te voegen.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Klik hier om de huidige pagina te legen.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Klik hier om de huidige pagina te verwijderen.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>Klik hier om de huidige pagina een plaats naar voren in de lijst te verplaatsen.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>Klik hier om de huidige pagina een plaats naar achteren in de lijst te verplaatsen.</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Leeg pagina</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Wilt u de geselecteerde
 pagina legen?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Verwijder pagina</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Wilt u de geselecteerde
 pagina verwijderen?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/euroconv.ts b/i18n/nl/euroconv.ts
index 4eb9e18..c3227e9 100644
--- a/i18n/nl/euroconv.ts
+++ b/i18n/nl/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Euroconversie</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/fifteen.ts b/i18n/nl/fifteen.ts
index 06927c3..e7b39cf 100644
--- a/i18n/nl/fifteen.ts
+++ b/i18n/nl/fifteen.ts
@@ -1,42 +1,42 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Hussel</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation>Los op</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
-        <translation>Vijftien stukjes</translation>
+        <translation>Schuifpuzzel</translation>
     </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
-        <translation>vijftien stukjes</translation>
+        <translation>Schuifpuzzel</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gefeliciteerd!
 Je hebt gewonnen!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>Hussel stukjes</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
         <translation>Herstel stukjes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/filebrowser.ts b/i18n/nl/filebrowser.ts
deleted file mode 100644
index 9e776ab..0000000
--- a/i18n/nl/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>File Manager</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Dir</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Sorteer</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>op Naam</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>op Grootte</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>op Datum</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>op Type</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Neer</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Verborgen</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Symlinks</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Miniaturen</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Weergave</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Voorgaande Map</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Hogere Map</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nieuwe Map</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Knip</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieer</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Plak</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>File Manager</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>Kan /dev/ map niet weergeven.</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Hernoem bestand</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Hernoemen mislukt!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Plak bestand</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Plakken misluktHernoemen mislukt!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Knip bestand</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Knippen mislukt!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Verwijder</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Bent u zeker?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nee</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Verwijderen mislukt!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nieuwe map</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Map maken mislukt!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Start Programma</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Starten Mislukt!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Voeg toe aan Documenten</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Start</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Belijk als tekst</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Hernoem</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Knip</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieer</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Plak</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Verander Rechten</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Selecteer alles</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>De-selecteer alles</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Verander rechten</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Stel Bestandsrechten in</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Stel Bestandsrechten in voor:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>eigenaar</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>groep</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>anderen</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Eigenaar</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Groep</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>lees</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>schrijf</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>uitvoeren</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/nl/formatter.ts b/i18n/nl/formatter.ts
index 088adc2..4b396b2 100644
--- a/i18n/nl/formatter.ts
+++ b/i18n/nl/formatter.ts
@@ -1,174 +1,221 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>formatter</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Opslagsoort</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Filesystemen</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatteer</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Startpunt</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>WAARSCHUWING:
+        <translation type="obsolete">WAARSCHUWING:
 Het veranderen van opties op
 deze pagina kan ervoor zorgen
 dat uw system niet meer goed
 functioneert!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>Wijzig fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Controleer Disk</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mount punt</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Formatteren?!?</translation>
+        <translation type="obsolete">Formatteren?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Echt Formatteren
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 met</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>bestandssysteem?!?
+        <translation type="obsolete">bestandssysteem?!?
 Alle data zal verloren gaan!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Kan niet formatteren.
 Onbekend type</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Formatteer uitvoer</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Probeer te umounten.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>umount mislukt!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Kan niet umounten.
 Apparaat is bezig!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Probeer te formatteren.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Dit apparaat bestaat niet!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 is succcesvol geformatteerd.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Probeer te mounten.</translation>
+        <translation type="obsolete">Probeer te mounten.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Kaart mount mislukt!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 is sucsesvol gemount.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>U kunt nu het uitvoerscherm sluiten.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Intern</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Opslagsoort :</translation>
+        <translation type="obsolete">Opslagsoort :</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Totaal %1 kB (%d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Gebruikt: %1 ( %d mB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Beschikbaar: %1 kB (%d mB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>WAARSCHUWING:
+Het veranderen van de instellingen
+op deze pagina kan ervoor zorgen
+dat uw systeem niet meer goed functioneert!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>Formatteren?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>met bestandssysteem %1?
+Alle data zal verloren gaan!!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>Probeer %1 te umount-en.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>Probeer %1 te mounten.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1
+is succesvol gemount.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Opslagtype: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Type %1
+Geformatteerd met %2
+%3, %4, %5</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/helpbrowser.ts b/i18n/nl/helpbrowser.ts
index 32ee202..fe5e15e 100644
--- a/i18n/nl/helpbrowser.ts
+++ b/i18n/nl/helpbrowser.ts
@@ -1,37 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Terug</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Vooruit</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Maak bookmark</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Verwijder bookmark</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Hulp bij Hulp</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation>Helppagina&apos;s</translation>
+        <translation type="obsolete">Helppagina&apos;s</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation>Ga</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/kpacman.ts b/i18n/nl/kpacman.ts
index 9b02282..16da28c 100644
--- a/i18n/nl/kpacman.ts
+++ b/i18n/nl/kpacman.ts
@@ -1,246 +1,254 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation>Standaardinstell</translation>
+        <translation>Standaardinstellingen</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancel</translation>
+        <translation>Annuleer</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Verander richtingtoetsen</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Ongedefinieerde toets</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nieuw</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Pause</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Highscore</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Stop</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Verberg Muiscursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Selecteer grafiche elementen</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Pauzeer in de achtergrond</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Ga door op de voorgrond</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Verander &amp;toetsen...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoenissen (joe@dsite.de)
 
 Een pacman spel voor de KDE Desktop
 Dit programma is gebaseerd op de bron van ksnake
 door Michel Filippi (mfilippi@sade.rhein-main.de).
 Het design is sterk beinvloed door Pacman (c)
 1980 MIDWAY MFG.CO.
 
 Ik wil hierbij mijn vriendin Elke Krueers bedanken
 voor de laatste 10 jaar van haar vriendschap.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
         <source>Configuration Error</source>
-        <translation>Canfiguratiefout</translation>
+        <translation type="obsolete">Canfiguratiefout</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
-        <translation>Er zijn geen schema&apos;s gedefinieerd,
+        <translation type="obsolete">Er zijn geen schema&apos;s gedefinieerd,
 of er is geen schema geselecteerd.</translation>
     </message>
+    <message>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
+    </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Het bitfont kan niet worden geconstrueerd
 
 Het bestand &apos;@FONTNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>GAME OVER</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>SPELER EEN</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>KLAAR!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUZE</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>KARAKTER</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
-        <translation>SCHUILNAAM</translation>
+        <translation>BIJNAAM</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SCHADUW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-MEPPER</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-PRIKKER</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA AANPASSING: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>DRUK OP CURSOR OM TE STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    GEFELICITEERD</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   U EEN TOP 10 SCORE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>BEHAALD.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   SCORE  NAAM  DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSED</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>De pixelmap kan niet worden gemaakt.
 
 Het bestand &apos;@PIXMAPNAME@&apos; bestaat niet,
 of is in een onbekend formaat.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initialisatiefout</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/launchersettings.ts b/i18n/nl/launchersettings.ts
index 2bad467..cee6fba 100644
--- a/i18n/nl/launchersettings.ts
+++ b/i18n/nl/launchersettings.ts
@@ -1,208 +1,223 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launcher instellingen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taakbalk</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Laad applets in O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Laat Launcher tabbladen zien in O_Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Vink de applets aan die je wilt gebruiken in het O-menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Voegt de inhoud van de Launcher tabbladen toe aan het O-Menu.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Voorbeeld 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Voorbeeld 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Voorbeeld 3</translation>
     </message>
 </context>
 <context>
+    <name>SampleView</name>
+    <message>
+        <source>Sample 1</source>
+        <translation type="obsolete">Voorbeeld 1</translation>
+    </message>
+    <message>
+        <source>Sample 2</source>
+        <translation type="obsolete">Voorbeeld 2</translation>
+    </message>
+    <message>
+        <source>Sample 3</source>
+        <translation type="obsolete">Voorbeeld 3</translation>
+    </message>
+</context>
+<context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Wijzig Tabblad</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Achtergrond</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Iconen</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Voorbeeld %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Dit is een ruw voorbeeld van hoe het geselecteerde tabblad eruit zal zien.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Gebruik een eigen lettertype</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Geregeld</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>Vulkleur</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Plaatje</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Selecteer...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Satandaard</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Grootte:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Kleur:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher tabbladen:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foo-balk</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Gebruik groot &apos;bezig&apos; icoon</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Gebruik knipperend &apos;bezig&apos; icoon</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Selecteer het Launcher tabblad dat je wilt wijzigen of verwijderen.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Voegt een nieuwe tab toe aan de Launcher.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Opent een nieuwe dialoog om de geselecteerde tab te veranderen.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Verwijdert een tab van de Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Activeer dit als je een groot &apos;bezig&apos; icoon in het midden van het scherm wilt ipv een in de taakbalk.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Activeer dit als je een knipperend &apos;bezig&apos; icoon wilt bij het starten van programma&apos;s in de Launcher.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Alle tabbladen</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Nog niet geimplementeerd</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Laad applets in de Taakbalk:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Vink de applets aan die je in de taakbalk wilt hebben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libfreetypefactory.ts b/i18n/nl/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/it/libfreetypefactory.ts
+++ b/i18n/nl/lib.ts
diff --git a/i18n/unmaintained/ko/libbend.ts b/i18n/nl/libbend.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ko/libbend.ts
+++ b/i18n/nl/libbend.ts
diff --git a/i18n/nl/libclockapplet.ts b/i18n/nl/libclockapplet.ts
index 4eb9e18..49556e0 100644
--- a/i18n/nl/libclockapplet.ts
+++ b/i18n/nl/libclockapplet.ts
@@ -1,2 +1,15 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Information</source>
+        <translation type="obsolete">Informaite</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet geldig.
+(%1)&lt;/p&gt;&lt;p&gt;Wilt u de klok bijstellen?&lt;/p&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libflatstyle.ts b/i18n/nl/libflatstyle.ts
index 4eb9e18..9486b74 100644
--- a/i18n/nl/libflatstyle.ts
+++ b/i18n/nl/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Vlak</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libinterfaces.ts b/i18n/nl/libinterfaces.ts
index 407ea1f..71292e8 100644
--- a/i18n/nl/libinterfaces.ts
+++ b/i18n/nl/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Geavanceerde Interface informatie</translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation type="unfinished"></translation>
+        <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Adres</translation>
     </message>
     <message>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetmasker</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP Informatie</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP Server</translation>
     </message>
     <message>
         <source>Lease Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Lease vervalt</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
-        <translation type="unfinished"></translation>
+        <translation>Lease gekregen</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC Adres</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Interfaceinformatie</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ververs</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
+        <translation>H&amp;erstart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Adres</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetmasker</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC Adres</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bekijk geavanceerde informatie</translation>
+    </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation>Ben &amp;Stil</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface Configuratie</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch starten</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Statische IP Configuratie</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetmasker</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Eerste DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Adres</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Tweede DNS</translation>
+    </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Herstarten interface</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libkppp.ts b/i18n/nl/libkppp.ts
new file mode 100644
index 0000000..ac23635
--- a/dev/null
+++ b/i18n/nl/libkppp.ts
@@ -0,0 +1,1452 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="obsolete">&amp;Wijzig...</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation>Geselecteerde verbinding wijzigen</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="obsolete">&amp;Nieuw...</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation>Maak een nieuwe inbelverbinding
+naar internet</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="obsolete">Ko&amp;pieer</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation>Maakt een kopie van de geselecteerde verbinding.
+Alle instellingen van de verbinding worden
+gekopieerd naar een nieuwe verbinding, die
+naar wens aan te passen zijn.
+</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="obsolete">&amp;Verwijder</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Verwijdert de geselecteerde
+verbinding
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>Maximum number of accounts reached.</source>
+        <translation type="obsolete">Maximumaantal verbindingen bereikt.</translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation>Geen verbinding geselecteerd.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation>Weet je zeker dat je deze
+verbinding &quot;%1&quot; wilt verwijderen?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Bevestig</translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation>Nieuwe verbinding</translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation>Wijzig verbinding:</translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation>Kies</translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation>Wijzig inloggegevens</translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation>Identificatie</translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation>IP instelling</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation>Gateway instelling</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Gateway</translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation>DNS Servers</translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation>DNS</translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation>Start programma&apos;s</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Start</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation>Unieke verbindingsnaam invoeren</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="obsolete">Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="obsolete">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="obsolete">GB</translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation>Identificatie:</translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation>Script-gebaseerd</translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation>PAP</translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation>Terminal-gebaseerd</translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation>CHAP</translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation>PAP/CHAP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation>&lt;p&gt;Geeft de identificatiemethode van de PPP server weer.
+De meeste universiteiten gebruiken nog &lt;b&gt;Terminal&lt;/b&gt;- or 
+&lt;b&gt;Script&lt;/b&gt;-gebaseerde identificatie, terwijl de meeste 
+providers&lt;b&gt;PAP&lt;/b&gt; en/of &lt;b&gt;CHAP&lt;/b&gt; gebruiken.
+Vraag bij onzekerheid je provider.
+
+Als je kunt kiezen tussen PAP and CHAP, kies dan CHAP,
+want het is veel veiliger. Weet je niet welke, kies dan PAP/CHAP.</translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation>Gebruikersnaam:</translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation>Voer hier je gebruikersnaam in...</translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation>Wachtwoord:</translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation>Voer hier je wachtwoord in</translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation>Bewaar wachtwoord</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation>&lt;p&gt;Als dit ingeschakeld is, wordt het wachtwoord
+in het &lt;i&gt;kppp&lt;/i&gt;&apos;s config bestand opgeslagen, 
+zodat je het niet iedere keer hoeft in te typen.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Waarschuwing:&lt;/font&gt; het wachtwoord wordt
+niet versleuteld bewaard in het config bestand,
+dat alleen voor jou leesbaar is. Zorg ervoor dat
+niemand er toegang toe krijgt!</translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation>fout</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation>&lt;qt&gt;Inlogscript heeft fout in start/stop script&lt;qt&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Wijzig...</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation>&amp;Nieuw...</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation>Ko&amp;pieer</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation>&amp;Verwijder</translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation>Domeinnaam:</translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation>Als je hier een domeinnaam invult, wordt deze
+gebruikt gedurende de verbinding. Als de 
+verbinding verbroken wordt, wordt de 
+oorspronkelijke domeinnaam van de computer
+hersteld.
+
+Als dit veld leeg blijft, wordt de domeinnaam niet veranderd.</translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation>Configuratie:</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automatisch</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Handmatig</translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation>DNS IP adres:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Hiermee kan een DNS server worden ingesteld
+voor gebruik tijdens de verbinding. Als de verbinding 
+verbroken wordt, wordt deze DNS server weer verwijderd.
+
+Voer het IP adres van de DNS server in, en druk op 
+&lt;b&gt;Toevoegen&lt;/b&gt;, om een DNS server in te stellen</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Toevoegen</translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation>Klik hier om de DNS server hierboven
+toe te voegen. Deze zal dan in de lijst 
+hieronder worden weergegeven</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation>Klik hier om de geselecteerde DNS server uit de
+onderstaande lijst te verwijderen</translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation>DNS adreslijst:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation>&lt;p&gt;Hier worden alle tijdens verbinding te 
+gebruiken DNS servers weergegeven. Gebruik de
+&lt;b&gt;Toevoegen&lt;/b&gt; en &lt;b&gt;Verwijderen&lt;/b&gt; knoppen
+om de lijst te veranderen</translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation>Schakel DNS servers uit tijdens verbinden</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation>Als deze optie ingeschakeld is, worden alle
+DNS servers in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; tijdelijk
+uitgeschakeld tijdens de verbinding. Zodra de
+verbinding verbroken wordt, worden de servers
+weer ingeschakeld
+
+Over het algemeen is deze optie niet nodig,
+maar hij kan handig zijn.</translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="obsolete">Geselecteerde verbinding wijzigen</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="obsolete">Maak een nieuwe inbelverbinding
+naar internet</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="obsolete">Maakt een kopie van de geselecteerde verbinding.
+Alle instellingen van de verbinding worden
+gekopieerd naar een nieuwe verbinding, die
+naar wens aan te passen zijn.
+</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Verwijdert de geselecteerde
+verbinding
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>No devices selected.</source>
+        <translation>Geen apparaat geselecteerd.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation>Deze verbinding echt 
+verwijderen: &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Bevestig</translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation>Nieuw apparaat</translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation>Wijzig apparaat:</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation>&amp;Apparaat</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation>&amp;Modem</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="obsolete">Unieke verbindingsnaam invoeren</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation>Staat toe het geselecteerde apparaat te wijzigen</translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation>Maak een nieuw apparaat aan</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation>Maakt een kopie van de geselecteerde verbinding.
+Alle instellingen van de verbinding worden
+gekopieerd naar een nieuwe verbinding, die
+naar wens aan te passen zijn</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Verwijdert het geselecteerde
+apparaat
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation>Unieke verbindingsnaam invoeren</translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation>Verbindingsnaam:</translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation>Voer een unieke naam voor deze verbinding in</translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation>Telefoonnummer:</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation>&amp;Toevoegen...</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>Ve&amp;rwijder</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation>&lt;p&gt;Stelt de te kiezen telefoonnummers in. Er
+kunnen meerdere nummers ingevuld worden
+door &lt;b&gt;Toevoegen&lt;/b&gt; te kiezen. De volgorde kan
+worden bepaald door gebruik van de pijltjestoetsen.
+
+Als met een nummer niet verbonden kan worden, zal
+&lt;i&gt;kppp&lt;/i&gt; het volgende proberen enz.</translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation>Wijzig pppd instellingen...</translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation>Hier kunnen opdrachten worden ingesteld om uitgevoerd te worden tijdens verschillende onderdelen van het verbinden. De opdrachten worden uitgevoerd met deze user-id, dus kunnen er geen opdrachten worden gebruikt die root rechten gebruiken (tenzij dit root is natuurlijk). &lt;br&gt;&lt;br&gt;Zorg ervoor dat het volledige pad ingevuld wordt, anders is het misschien onvindbaar.</translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation>Voor verbinding:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation>Hiermee kan een programma worden gestart &lt;b&gt;voordat&lt;/b&gt; 
+een verbinding wordt gemaakt. Het wordt direct voor het 
+inbellen gestart.
+
+Dit kan handig zijn, bv. om HylaFAX tijdelijk uit te schakelen,
+omdat deze de lijn blokkeert.</translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation>Na verbinden:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation>Hiermee kan een programma worden gestart &lt;b&gt;nadat&lt;/b&gt; 
+een verbinding is gemaakt. Het programma wordt pas
+gestart nadat de internetverbinding is opgebouwd.
+
+Erg handig voor het ophalen van mail en nieuws</translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation>Voor verbreken:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation>Hiermee kan een programma worden gestart &lt;b&gt;voordat&lt;/b&gt; 
+de verbinding wordt gesloten. De verbinding blijft open
+tot het programma gestopt is.</translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation>Na verbreken:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation>Hiermee kan een prograama worden gestart &lt;b&gt;nadat&lt;/b&gt;
+de verbinding is gesloten.</translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuratie</translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation>Standaardgateway</translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation>Deze optie zorgt ervoor dat de PPP peer computer
+(de computer waar verbinding mee gemaakt wordt)
+als gateway fungeert. Deze computer zal dan alle
+gegevens die niet voor het lokale netwerk zijn,
+doorsturen naar die computer, die dan de
+routering zal verzorgen.
+
+Dit is een standaardinstelling, meestal is deze juist.</translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation>Statische gateway</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation>&lt;p&gt;Geeft aan welke computer als gateway gebruikt
+moet worden (zie &lt;i&gt;Standaardgateway&lt;/i&gt; hierboven)</translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation>Gateway IP adres:</translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation>Stel de standaard gateway route in</translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation>Als deze functie aan staat worden alle
+gegevens buiten het lokale netwerk
+doorgeleid via de PPP verbinding.
+
+Normaal staat dit aan</translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuratie</translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation>Dynamisch IP adres</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation>Selecteer deze optie als deze computer bij iedere
+verbinding dynamisch een IP adres toegewezen
+krijgt.
+
+Bijna iedere provider gebruikt deze optie,
+dus dit moet normaal aan staan.</translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation>Statisch IP adres</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation>Selecteer deze optie als deze computer een vast
+IP adres heeft. De meeste computers hebben dit
+niet, dus moet in de meeste gevallen dynamisch
+IP adres ingesteld worden.</translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation>IP adres:</translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation>Als deze computer een permanent internet
+adres heeft, kunt u hier uw IP adres invoeren.</translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation>Subnetmasker:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation>&lt;p&gt;Als deze computer een statisch IP adres heeft,
+moet hier het netwerkmasker ingevuld worden. In bijna
+alle gevallen is dit &lt;b&gt;255.255.255.0&lt;/b&gt;, maar
+het kan anders zijn.
+
+Vraag bij twijfel de provider</translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation>Auto-configureer de hostnaam van dit IP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation>&lt;p&gt;Altijd als je verbinding maakt, stelt dit de
+hostnaam in in overeenstemming met het van de
+PPP server verkregen IP adres. Dit kan handig
+zijn bij het gebruik van een protocol dat van deze
+informatie gebruik maakt, maar het kan ook 
+een aantal &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problemen&lt;/a&gt; veroorzaken.
+
+Gebruik dit niet indien niet vereist.</translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation>Het selecteren van deze optie kan problemen veroorzaken met de X-server en programma&apos;s tijdens een kppp verbinding. Niet gebruiken indien niet specifiek vereist!
+Zie &quot;Frequently asked questions&quot; in het handboek(of help) voor meer informatie.</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Waarschuwing</translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation>Geen wachtwoord</translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation>Gebruikersnaam gedefinieerd, maar
+geen wachtwoord. Voer wachtwoord in</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation>Modem&amp;naam:</translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation>Modema&amp;pparaat:</translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation>&amp;Flow control:</translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation>Hardware [CRTSCTS]</translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation>Software [XON/XOFF]</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation>Verbi&amp;ndingssnelheid:</translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation>Gebr&amp;uik lock file</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation>Modem timeout:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>sec</translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation>Wachttijd bij bezet:</translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation>&amp;Wacht op kiestoon voor kiezen</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>sec</translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation>Modem &amp;volume:</translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation>Mo&amp;demcommando&apos;s...</translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation>Configureer modem</translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation>Modemfalen</translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation>Een kritieke fout trad op bij modemtest</translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation>&amp;Verbindingen</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="obsolete">&amp;Apparaat</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="obsolete">&amp;Modem</translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation>Wijzig pppd functies</translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation>Functie:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Toevoegen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Standaardinstelling</translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation>Telefoonummer toevoegen</translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation>Voer telefoonnummer in:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation>PPP</translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation>generiek ppp apparaat</translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation>Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation>KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation>GB</translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject::ModemWidget</name>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="obsolete">Modem timeout:</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation>Toevoegen</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Invoegen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libliquid.ts b/i18n/nl/libliquid.ts
index a60e040..2c41418 100644
--- a/i18n/nl/libliquid.ts
+++ b/i18n/nl/libliquid.ts
@@ -1,71 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Vloeibaar</translation>
+    </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Stijl Vloeibaar</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen transparantie</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestippeld, achtergrondkleur</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestippeld, knopkleur</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation>Transparant gestippeld, achtergrondkleur</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation>Transparant gestippeld, knopkleur</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
+        <translation>Eigen transparantie</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished"></translation>
+        <translation>Menukleur</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished"></translation>
+        <translation>Opaciteit</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruik geschaduwde menutekst</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak gereedschapsbalk vlak</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestippeld contrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation type="unfinished"></translation>
+        <translation>Vloeibaar</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
+        <translation>High Performance Vloeibaar stijl door Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libmadplugin.ts b/i18n/nl/libmadplugin.ts
new file mode 100644
index 0000000..6e69798
--- a/dev/null
+++ b/i18n/nl/libmadplugin.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LibMadPlugin</name>
+    <message>
+        <source>No Song Open</source>
+        <translation>Geen nummer open</translation>
+    </message>
+    <message>
+        <source>Info: </source>
+        <translation>Info:</translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation>Naam:</translation>
+    </message>
+    <message>
+        <source>Genre: </source>
+        <translation>Genre:</translation>
+    </message>
+    <message>
+        <source>Bitrate: </source>
+        <translation>Bitrate:</translation>
+    </message>
+    <message>
+        <source>URL: </source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titel</translation>
+    </message>
+    <message>
+        <source>Artist</source>
+        <translation>Artiest</translation>
+    </message>
+    <message>
+        <source>Album</source>
+        <translation>Album</translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation>Jaar</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commentaar</translation>
+    </message>
+    <message>
+        <source>, Track: </source>
+        <translation>, Track:</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libmail.ts b/i18n/nl/libmail.ts
new file mode 100644
index 0000000..d3813d4
--- a/dev/null
+++ b/i18n/nl/libmail.ts
@@ -0,0 +1,100 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MailFactory</name>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Kan bestand &apos;%1&apos; niet bijvoegen. Toch doorgaan of afbreken?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation>Ga door</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Breek af</translation>
+    </message>
+</context>
+<context>
+    <name>SmtpHandler</name>
+    <message>
+        <source>Looking up host...</source>
+        <translation>Zoek host op...</translation>
+    </message>
+    <message>
+        <source>The server refused the connection.</source>
+        <translation>De server weigert de verbinding.</translation>
+    </message>
+    <message>
+        <source>Host lookup failed.</source>
+        <translation>Host opzoeken mislukt.</translation>
+    </message>
+    <message>
+        <source>The read from the socket failed for an unknown reason.</source>
+        <translation>Het lezen van de bron mislukte om onbekende redenen.</translation>
+    </message>
+    <message>
+        <source>The sending failed for an unknown reason.</source>
+        <translation>Het zenden mislukte om onbekende redenen.</translation>
+    </message>
+    <message>
+        <source>Host found.</source>
+        <translation>Host gevonden.</translation>
+    </message>
+    <message>
+        <source>Connected to %1</source>
+        <translation>Verbonden met %1</translation>
+    </message>
+    <message>
+        <source>SMTP &gt; %3</source>
+        <translation>SMTP &gt; %3</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; EHLO *</source>
+        <translation>SMTP&gt; EHLO *</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; AUTH CRAM-MD5</source>
+        <translation>SMTP&gt; AUTH CRAM-MD5</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; Authenticating</source>
+        <translation>SMTP&gt; Verifieren</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; HELO *</source>
+        <translation>SMTP&gt; HELO *</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; MAIL FROM: *</source>
+        <translation>SMTP&gt; MAIL VAN: *</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; RCPT TO: *</source>
+        <translation>SMTP&gt; RECU NAAR: *</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; DATA</source>
+        <translation>SMTP&gt; DATA</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; Sending data...</source>
+        <translation>SMTP&gt; Zenden data...</translation>
+    </message>
+    <message>
+        <source>SMTP&gt; QUIT (Done)</source>
+        <translation>SMTP&gt; QUIT (Klaar)</translation>
+    </message>
+    <message>
+        <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
+        <translation>De server gaf een fout. Dit is het bericht:&lt;br&gt;%1</translation>
+    </message>
+    <message>
+        <source>SMTP &lt; %3</source>
+        <translation>SMTP &lt; %3</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/librestartapplet.ts b/i18n/nl/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/it/librestartapplet.ts
+++ b/i18n/nl/libmodplugin.ts
diff --git a/i18n/nl/libopie.ts b/i18n/nl/libopie.ts
index 29ce127..1451901 100644
--- a/i18n/nl/libopie.ts
+++ b/i18n/nl/libopie.ts
@@ -1,108 +1,663 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>Kalenderknop</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>Contaktenknop</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>Menuknop</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>Mailknop</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>Thuisknop</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>Opnameknop</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>Beeldschermrotatie</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Lager en omhoog</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Lager en omlaag</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Lager en naar rechts</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Lager en naar links</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Hoger en omhoog</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Hoger en omlaag</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Hoger en naar rechts</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Hoger en naar links</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>Kleur:</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>Verz:</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>Waarde:</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>Rood:</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>Groen:</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>Blauw:</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>Alpha kanaal:</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>Selecteer kleur</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>Meer</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>Meer...</translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>Naam:</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>Mime Type</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>Groot</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>Middel</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>Klein</translation>
+    </message>
+</context>
+<context>
+    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Maand</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jaar</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Iedere:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequentie</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Beeindig op:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Geen einddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Wo</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var 1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>Geen einddatum</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>dagen</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>dag</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>weken</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>week</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>maanden</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>maand</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>jaren</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>jaar</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>en</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>,
+ en</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>, en</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>op</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>Geen herhaling</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>dag(en)</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>Herhaal op</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>Ma</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>Di</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>Wo</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>Do</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>Vr</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>Za</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>Zo</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>we(e)k(en)</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>Herhaal op</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>Dag</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>maand(en)</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>ja(a)r(en)</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Iedere</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Kies tijd:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation>Documenten</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Bestanden</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Alle bestanden</translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="obsolete">Omschrijving:</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Prioriteit:</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Heel hoog</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Hoog</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normaal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Laag</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Heel laag</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Voortgang:</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>Einddatum:</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>Standaard email:</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>Bedrijf:</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>Bedrijfswebpagina:</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>Bedrijfs telefoon:</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>Bedrijfs fax:</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>Bedrijfs mobiel:</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>Bedrijfs pieper:</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>Prive webpagina:</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>Prive telefoon:</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>Prive Fax:</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>Prive mobiel:</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>Alle Emails:</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>Beroep:</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>Assistent:</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>Manager:</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>Man</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>Vrouw</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>Geslacht:</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>Wederhelft:</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>Verjaardag:</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>Jaardag:</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>Kinderen:</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>Bijnaam:</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>Notities:</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Plaats:</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Deze gebeurtenis duurt de hele dag</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Deze gebeurtenis duurt meerdere dagen</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>Start:</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>Eind:</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>Notities:</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>Iedere</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>%1 %2 iedere</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>De %1 iedere</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>De %1 %2 van iedere</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>Iedere</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>Maandag</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>Dinsdag</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>Woensdag</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>Donderdag</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>Vrijdag</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>Zaterdag</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>Zondag</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>ste</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>de</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>de</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>de</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libopieobex.ts b/i18n/nl/libopieobex.ts
index 501d230..3891a96 100644
--- a/i18n/nl/libopieobex.ts
+++ b/i18n/nl/libopieobex.ts
@@ -1,76 +1,150 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepteer</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>Klaar</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>IrDa staat niet aan!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>Zoek naar IrDa apparaten.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>Bluetooth is niet beschikbaar</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>Zoek naar bluetooth apparaten.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>Plan IrDa verzending.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klick voor IrDa verzending</translation>
+        <translation>Klik voor IrDa verzending</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Verzonden</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Poging %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Zoek nogmaals naar IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Start verzending</translation>
     </message>
 </context>
+<context>
+    <name>OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="obsolete">Accepteer</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="obsolete">Weiger</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation type="obsolete">&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
+    </message>
+</context>
+<context>
+    <name>SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="obsolete">Klaar</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="obsolete">IrDa staat niet aan!</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="obsolete">Zoek naar IrDa apparaten.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="obsolete">Bluetooth is niet beschikbaar</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="obsolete">Zoek naar bluetooth apparaten.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="obsolete">Plan IrDa verzending.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="obsolete">Klick voor IrDa verzending</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="obsolete">Verzonden</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="obsolete">Mislukt</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="obsolete">Poging %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="obsolete">Zoek nogmaals naar IrDa.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="obsolete">Start verzending</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libqkjumpx.ts b/i18n/nl/libqkjumpx.ts
index 964d5dc..2f0bdbc 100644
--- a/i18n/nl/libqkjumpx.ts
+++ b/i18n/nl/libqkjumpx.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>KJumpX</source>
-        <translation type="unfinished"></translation>
+        <translation>KJumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libqpe.ts b/i18n/nl/libqpe.ts
index 69bbdfe..00fd430 100644
--- a/i18n/nl/libqpe.ts
+++ b/i18n/nl/libqpe.ts
@@ -1,902 +1,995 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Werk</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Persoonlijk</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nieuwe Categorie</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nieuwe Categorie</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Wijzig Categorie</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorieen</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorieen komen hier</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Controleer de categorieen waar dit document toe behoort.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Voer hier een nieuwe categorie in. Druk op &lt;b&gt;Voeg toe&lt;/b&gt; om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg Toe</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Maak links een nieuwe categorie, en druk op deze om hem aan de lijst toe te voegen.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Druk in om de gekozen categorie te verwijderen.</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Algemeen</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Vink aan om dit attribuut beschikbaar te maken voor alle programma&apos;s.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Sorry, een ander programma
 vwijzigt al categorieen.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Wijzig Categorieen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Laat januari in het geselecteerde jaar zien</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Laat de afgelopen maand zien</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Laat de volgende maand zien</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Laat december in het geselecteerde jaar zien</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Sluit de destandskiezer</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Laat bestanden van dit type zien</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Laat bestanden van deze categorie zien</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Klik om een bestand uit de lijst te selecteren</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, of selecteer &lt;b&gt;Nieuw Document&lt;b/&gt; om een nieuw document te maken.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Houd ingedrukt om documenteigenschappen te zien.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Tekenreeks niet gevonden.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Einde bereikt, begin bovenaan</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Vind wat:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categorie:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Start zoeken op:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Zoek achteruit</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>Eigenschappen</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Documentaanzicht</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Verwijderen van bestand mislukt.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harde schijf</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopie van</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikaat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Bestandskopie mislukt.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Verschuiven van bestand mislukt.</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Gebruik eigen rotatie</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Laad dit bestand alvast in zodat het direct beschkbaar is.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>De naam van dit document.</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>De media waarop dit bestand zich bevindt.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Snelladen (gebruikt geheugen)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Commentaar:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Verwijder dit document.</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopieer</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Maak een kopie van dit document.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur via IR</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Verstuur dit bestand via IR naar een ander apparaat.</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informatie over de Eigenaar</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Voer wachtwoord in</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Nieuw Document</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Er is een probleem bij het maken
 van Configuratieinformatie voor
 dit programma.
 
 Maak ruimte vrij, en probeer
 nogmaals.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Kan geen startbestanden maken.
 Maak aub plaats voordat u
 data gaat invoeren</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het
 nogmaals.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
         <source>year</source>
         <translation>jaar</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</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>Are you sure you want to delete
  %1?</source>
-        <translation>Weet u zeker dat u %1
+        <translation type="obsolete">Weet u zeker dat u %1
 wilt verwijderen?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Werkadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Thuisadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>eMailadres:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefoon Prive:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Prive:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobiel Prive:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Webpagina Prive:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Webpagina Werk:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kantoor:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefoon Werk:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Werk:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobiel Werk:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pieper Werk:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Echtgeno(o)t(e):</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Verjaardag:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Jaardag:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naam Titel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Functietitel</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Bedrijf</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Telefoon Werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Mobiel Werk</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>algemene eMailadres</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Eamiladressen</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Telefoon Prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Mobiel Prive</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Werk Straat</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Werk Plaats</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Werk Provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Werk Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Werk Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pieper Werk</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Webpagina Werk</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Manager</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Prive Straat</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Prive Plaats</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Prive Provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Prive Postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Prive Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Prive Webpagina</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Kinderen</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groepen</translation>
     </message>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Klik om dit venster te sluiten zonder op te slaan.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Klik om dit venster te sluiten.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Klik om dit venster beweegbaar te maken.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Klik om te maximaliseren.</translation>
+    </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation>&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation>Wat is dit...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Weet U zeker dat u dit bestand wilt verwijderen
+%1&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation>jan</translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation>feb</translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation>mar</translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation>apr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>mei</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>aug</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>sep</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>okt</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>dec</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
+        <translation type="obsolete">&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>Wat is dit...</translation>
+        <translation type="obsolete">Wat is dit...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Klik om dit venster te sluiten zoner op te slaan.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten zoner op te slaan.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Klik om dit venster te sluiten.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
+        <translation type="obsolete">Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Klik om dit venster beweegbaar te maken.</translation>
+        <translation type="obsolete">Klik om dit venster beweegbaar te maken.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Klik om te maximaliseren.</translation>
+        <translation type="obsolete">Klik om te maximaliseren.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kaart</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kaart</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern geheugen</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Interne opslag</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>Tijdzoneprogramma niet gevonden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Om de tijdzones te kunnen kiezen
 moet u het programma citytime
 installeren.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Geen plaats</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het nogmaals</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 files</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %1
 
 ninor mimetype / major mimetype</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Alle %1 bestanden</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libqunikeyboard.ts b/i18n/nl/libqunikeyboard.ts
new file mode 100644
index 0000000..caf766c
--- a/dev/null
+++ b/i18n/nl/libqunikeyboard.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libsuspendapplet.ts b/i18n/nl/libsuspendapplet.ts
new file mode 100644
index 0000000..7887682
--- a/dev/null
+++ b/i18n/nl/libsuspendapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SuspendApplet</name>
+    <message>
+        <source>Suspend shortcut</source>
+        <translation>Slaapstand sneltoets</translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation>Slaapstand</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtheme.ts b/i18n/nl/libtheme.ts
new file mode 100644
index 0000000..7baca78
--- a/dev/null
+++ b/i18n/nl/libtheme.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Styles</name>
+    <message>
+        <source>Themed style</source>
+        <translation>Stijl naar thema</translation>
+    </message>
+    <message>
+        <source>KDE2 theme compatible style engine</source>
+        <translation>KDE2 thema compatible stijlmaker</translation>
+    </message>
+</context>
+<context>
+    <name>ThemeSettings</name>
+    <message>
+        <source>Theme Style</source>
+        <translation>Stijl naar thema</translation>
+    </message>
+    <message>
+        <source>Select the theme to be used</source>
+        <translation>Selecteer het te gebruiken thema</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Omschrijving</translation>
+    </message>
+    <message>
+        <source>[No theme]</source>
+        <translation>[Geen thema]</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodayaddressbookplugin.ts b/i18n/nl/libtodayaddressbookplugin.ts
new file mode 100644
index 0000000..ba47ec0
--- a/dev/null
+++ b/i18n/nl/libtodayaddressbookplugin.ts
@@ -0,0 +1,94 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AddressBookPluginConfig</name>
+    <message>
+        <source>Max Lines: </source>
+        <translation>Max lijnen:</translation>
+    </message>
+    <message>
+        <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
+        <translation>Stel het maximumaantal lijnen in dat getoond moet worden per verjaardag/jaardag</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars: </source>
+        <translation>Knip lijn na X tekens:</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Na hoeveel tekens de info over de taak afgebroken moet worden</translation>
+    </message>
+    <message>
+        <source>Days look ahead: </source>
+        <translation>Dagen vooruitzien:</translation>
+    </message>
+    <message>
+        <source>How many days we should search forward</source>
+        <translation>Hoeveel dagen er vooruit gezocht moet worden</translation>
+    </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="obsolete">Om instellingen te activeren: Herstart programma!</translation>
+    </message>
+    <message>
+        <source>Set Headline Color: </source>
+        <translation>Stel titelbalkkleur in:</translation>
+    </message>
+    <message>
+        <source>Colors for the headlines !</source>
+        <translation>Kleuren voor de titelbalk!</translation>
+    </message>
+    <message>
+        <source>Set Entry Color: </source>
+        <translation>Stel beginkleur in:</translation>
+    </message>
+    <message>
+        <source>This color will be used for shown birthdays/anniversaries !</source>
+        <translation>Deze kleur zal worden gebruikt voor verjaardagen/jaardagen!</translation>
+    </message>
+    <message>
+        <source>Set Urgent
+Color if below </source>
+        <translation>Stel urgentkleur in
+als minder dan</translation>
+    </message>
+    <message>
+        <source> days: </source>
+        <translation>dagen:</translation>
+    </message>
+    <message>
+        <source>This urgent color will be used if we are close to the event !</source>
+        <translation>Deze urgentkleur zal worden gebruikt als de taak dichtbij is!</translation>
+    </message>
+    <message>
+        <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
+        <translation>De urgentkleur wordt gebruikt als de verjaardag/jaardag dichterbij is dan het aangegeven aantal dagen!</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>AddressBook plugin</source>
+        <translation>Adresboek plugin</translation>
+    </message>
+    <message>
+        <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
+        <translation>Volgende verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
+    </message>
+    <message>
+        <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
+        <translation>Geen verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
+    </message>
+    <message>
+        <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
+        <translation>Volgende jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
+    </message>
+    <message>
+        <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
+        <translation>Geen jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
+    </message>
+    <message>
+        <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
+        <translation>Database biedt deze zoekopdracht niet! libOpie upgraden aub!&lt;br&gt;</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodaydatebookplugin.ts b/i18n/nl/libtodaydatebookplugin.ts
new file mode 100644
index 0000000..40772f3
--- a/dev/null
+++ b/i18n/nl/libtodaydatebookplugin.ts
@@ -0,0 +1,146 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DateBookEvent</name>
+    <message>
+        <source>[with alarm]</source>
+        <translation>[met alarm]</translation>
+    </message>
+    <message>
+        <source>note</source>
+        <translation>notitie</translation>
+    </message>
+    <message>
+        <source>All day</source>
+        <translation>Hele dag</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfig</name>
+    <message>
+        <source>Show location</source>
+        <translation type="obsolete">Laat locatie zien</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation type="obsolete">Klik hier als iedere afspraak met plaats weergegeven moet worden</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation type="obsolete">Laat notitie zien</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation type="obsolete">Klik hier als iedere afspraak met notitie weergegeven moet worden</translation>
+    </message>
+    <message>
+        <source>Show only later
+ appointments</source>
+        <translation type="obsolete">Laat alleen latere
+afspraken zien</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation type="obsolete">Klik hier als alleen afspraken later dan de huidige tijd weergegeven moeten worden</translation>
+    </message>
+    <message>
+        <source>How many 
+appointment
+should be 
+shown?</source>
+        <translation type="obsolete">Hoeveel
+afspraken
+moeten worden
+getoond?</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation type="obsolete">Hoeveel afspraken moeten maximaal worden weergegeven. Chronologisch</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation type="obsolete">Hoeveel dagen meer</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation type="obsolete">Hoeveel dagen meer moeten in de reeks zitten</translation>
+    </message>
+    <message>
+        <source> day(s)</source>
+        <translation type="obsolete">dag(en)</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="obsolete">alleen vandaag</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>DatumboekPluginConfiguratieBasis</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Laat locatie zien</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Klik hier als iedere afspraak met plaats weergegeven moet worden</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Laat notitie zien</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Klik hier als iedere afspraak met notitie weergegeven moet worden</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Klik hier als alleen afspraken later dan de huidige tijd weergegeven moeten worden</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Laat tijd in extra regel zien</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Hoeveel afspraken moeten maximaal worden weergegeven. Chronologisch</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>Hoeveel afspraken moeten worden weergegeven?</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation>alleen vandaag</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Hoeveel dagen moeten verder in de reeks zitten</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Hoeveel verdere dagen</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Datebook plugin</source>
+        <translation>Agendaplugin</translation>
+    </message>
+    <message>
+        <source>No more appointments today</source>
+        <translation>Geen afspraken meer vandaag</translation>
+    </message>
+    <message>
+        <source>No appointments today</source>
+        <translation>Geen afspraken vandaag</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodayfortuneplugin.ts b/i18n/nl/libtodayfortuneplugin.ts
new file mode 100644
index 0000000..02e765b
--- a/dev/null
+++ b/i18n/nl/libtodayfortuneplugin.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Fortune plugin</source>
+        <translation>Spreukenplugin</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodaymailplugin.ts b/i18n/nl/libtodaymailplugin.ts
new file mode 100644
index 0000000..cdcd5b1
--- a/dev/null
+++ b/i18n/nl/libtodaymailplugin.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Mail plugin</source>
+        <translation>Mail plugin</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
+        <translation>&lt;b&gt;%1&lt;/b&gt; nieuwe mail(s), &lt;b&gt;%2&lt;/b&gt; uitgaand</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodaystocktickerplugin.ts b/i18n/nl/libtodaystocktickerplugin.ts
new file mode 100644
index 0000000..9be1108
--- a/dev/null
+++ b/i18n/nl/libtodaystocktickerplugin.ts
@@ -0,0 +1,101 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>StockTicker plugin</source>
+        <translation>Beurskoers plugin</translation>
+    </message>
+</context>
+<context>
+    <name>StockTickerPluginWidget</name>
+    <message>
+        <source>Connection refused.</source>
+        <translation>Verbinding geweigerd.</translation>
+    </message>
+    <message>
+        <source>Could not find server.</source>
+        <translation>Kan server niet vinden.</translation>
+    </message>
+    <message>
+        <source>Socket read error.</source>
+        <translation>Bestandsleesfout.</translation>
+    </message>
+</context>
+<context>
+    <name>StocktickerPluginConfig</name>
+    <message>
+        <source>Enter stock symbols seperated
+by a space.</source>
+        <translation>Voer aandeelsymbolen in,
+gescheiden door een spatie.</translation>
+    </message>
+    <message>
+        <source>Toggles Time of current price field</source>
+        <translation>Schakel tussen tijd of huidige prijs</translation>
+    </message>
+    <message>
+        <source>Toggles date field</source>
+        <translation>Shcakelt tijdveld</translation>
+    </message>
+    <message>
+        <source>Toggles Symbol field</source>
+        <translation>Schakelt Symboolveld</translation>
+    </message>
+    <message>
+        <source>Toggles Name of symbols owner field</source>
+        <translation>Schakelt Naam van symbolen eigenaar veld</translation>
+    </message>
+    <message>
+        <source>Toggles current Price field</source>
+        <translation>Schakelt huidige prijs veld</translation>
+    </message>
+    <message>
+        <source>Toggles last price field</source>
+        <translation>Schakelt laatste prijs veld</translation>
+    </message>
+    <message>
+        <source>Toggles opening price field</source>
+        <translation>Schakelt openings prijs veld</translation>
+    </message>
+    <message>
+        <source>Toggles minimum daily price field</source>
+        <translation>Schakelt minimum dagelijkse prijs veld</translation>
+    </message>
+    <message>
+        <source>Toggles maximum daily price field</source>
+        <translation>Schakelt maximum dagelijkse prijs veld</translation>
+    </message>
+    <message>
+        <source>Toggles daily variation of price field</source>
+        <translation>Schakelt dagelijkse prijs variatie veld</translation>
+    </message>
+    <message>
+        <source>Toggles volume of trading field</source>
+        <translation>Schakelt verkoopvolume veld</translation>
+    </message>
+    <message>
+        <source>How often stocks prices should be looked up. In minutes</source>
+        <translation>Hoe vaak koersinfo opgehaald moet worden. In minuten</translation>
+    </message>
+    <message>
+        <source>Minutes between lookups.</source>
+        <translation>Minuten tussen ophalen.</translation>
+    </message>
+    <message>
+        <source>Speed of scrolling action, in milliseconds</source>
+        <translation>Snelheid van scrollen, in milliseconden</translation>
+    </message>
+    <message>
+        <source>Scroll Speed, in milliseconds</source>
+        <translation>Scrollsnelheid in milliseconden</translation>
+    </message>
+    <message>
+        <source>Length of scrolling</source>
+        <translation>Lengte van scrollen</translation>
+    </message>
+    <message>
+        <source>Scroll Length</source>
+        <translation>Scrollengte</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodaytodolistplugin.ts b/i18n/nl/libtodaytodolistplugin.ts
new file mode 100644
index 0000000..e06f786
--- a/dev/null
+++ b/i18n/nl/libtodaytodolistplugin.ts
@@ -0,0 +1,59 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Todolist plugin</source>
+        <translation>Te Doen-lijst plugin</translation>
+    </message>
+    <message>
+        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
+        <translation>Er is &lt;b&gt; 1&lt;/b&gt; actieve taak:  &lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
+        <translation>Er zijn &lt;b&gt; %1&lt;/b&gt; achtieve taken:  &lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>No active tasks</source>
+        <translation>Geen actieve taken</translation>
+    </message>
+</context>
+<context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Stel het maximum aantal te tonen taken in</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>taken weergegeven</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Na hoeveel tekens moet de info over de taak worden afgebroken</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Breek af na X tekens</translation>
+    </message>
+</context>
+<context>
+    <name>TodolistPluginConfig</name>
+    <message>
+        <source>tasks shown </source>
+        <translation type="obsolete">weergegeven taken</translation>
+    </message>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation type="obsolete">Stel het maximum aantal te tonen taken in</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="obsolete">Breek af na X tekens</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation type="obsolete">Na hoeveel tekens moet de info over de taak worden afgebroken</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libtodayweatherplugin.ts b/i18n/nl/libtodayweatherplugin.ts
new file mode 100644
index 0000000..bcc6366
--- a/dev/null
+++ b/i18n/nl/libtodayweatherplugin.ts
@@ -0,0 +1,117 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Weather plugin</source>
+        <translation>Weerplugin</translation>
+    </message>
+</context>
+<context>
+    <name>WeatherPluginConfig</name>
+    <message>
+        <source>Enter ICAO location identifier:</source>
+        <translation>Voer ICAO locatienummer in:</translation>
+    </message>
+    <message>
+        <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
+        <translation>Voer de 4 lettercode van de gewenste plaats in. Zie http://www.nws.noaa.gov/tg/siteloc.shtml om een locatie in de buurt te vinden.</translation>
+    </message>
+    <message>
+        <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
+        <translation>Bezoek http://www.nws.noaa.gov/tg/siteloc.shtml om de dichtstbijzijnde plaats te vinden.</translation>
+    </message>
+    <message>
+        <source>Use metric units</source>
+        <translation>Gebruik metrische eenheden</translation>
+    </message>
+    <message>
+        <source>Click here to select type of units displayed.</source>
+        <translation>Klik hier om het soort eenheden te kiezen.</translation>
+    </message>
+    <message>
+        <source>Update frequency (in minutes):</source>
+        <translation>Updatefrequentie (in minuten):</translation>
+    </message>
+    <message>
+        <source>Select how often (in minutes) you want the weather to be updated.</source>
+        <translation>Selecteer hoe vaak (in minuten) het weer moet worden geupdate.</translation>
+    </message>
+</context>
+<context>
+    <name>WeatherPluginWidget</name>
+    <message>
+        <source>Retreiving current weather information.</source>
+        <translation>Ophalen recente weerinformatie.</translation>
+    </message>
+    <message>
+        <source>Temp: </source>
+        <translation>Temp:</translation>
+    </message>
+    <message>
+        <source>  Wind: </source>
+        <translation>Wind:</translation>
+    </message>
+    <message>
+        <source>
+Pres: </source>
+        <translation>
+Luchtdruk:</translation>
+    </message>
+    <message>
+        <source>Current weather data not available.</source>
+        <translation>Recente weerinformatie niet beschikbaar.</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/b</translation>
+    </message>
+    <message>
+        <source>E </source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <source>NE </source>
+        <translation>NO</translation>
+    </message>
+    <message>
+        <source>N </source>
+        <translation>N</translation>
+    </message>
+    <message>
+        <source>NW </source>
+        <translation>NW</translation>
+    </message>
+    <message>
+        <source>W </source>
+        <translation>W</translation>
+    </message>
+    <message>
+        <source>SW </source>
+        <translation>ZW</translation>
+    </message>
+    <message>
+        <source>S </source>
+        <translation>Z</translation>
+    </message>
+    <message>
+        <source>SE </source>
+        <translation>ZO</translation>
+    </message>
+    <message>
+        <source> KPH</source>
+        <translation>KPH</translation>
+    </message>
+    <message>
+        <source> MPH</source>
+        <translation>MPH</translation>
+    </message>
+    <message>
+        <source> hPa</source>
+        <translation>hPa</translation>
+    </message>
+    <message>
+        <source> Hg</source>
+        <translation>Hg</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/sfcave-sdl.ts b/i18n/nl/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/it/sfcave-sdl.ts
+++ b/i18n/nl/libtremorplugin.ts
diff --git a/i18n/nl/libvmemoapplet.ts b/i18n/nl/libvmemoapplet.ts
new file mode 100644
index 0000000..2de257f
--- a/dev/null
+++ b/i18n/nl/libvmemoapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VMemo</name>
+    <message>
+        <source>Note</source>
+        <translation>Notitie</translation>
+    </message>
+    <message>
+        <source>error recording</source>
+        <translation>fout bij opname</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libvolumeapplet.ts b/i18n/nl/libvolumeapplet.ts
new file mode 100644
index 0000000..b5af0af
--- a/dev/null
+++ b/i18n/nl/libvolumeapplet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VolumeControl</name>
+    <message>
+        <source>Enable Sounds for:</source>
+        <translation>Zet geluid aan voor:</translation>
+    </message>
+    <message>
+        <source>Screen Taps</source>
+        <translation>Schermaanrakingen</translation>
+    </message>
+    <message>
+        <source>Key Clicks</source>
+        <translation>Toetsdrukken</translation>
+    </message>
+    <message>
+        <source>Alarm Sound</source>
+        <translation>Alarmgeluid</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/no/libwavplugin.ts b/i18n/nl/libwavplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/no/libwavplugin.ts
+++ b/i18n/nl/libwavplugin.ts
diff --git a/i18n/nl/libwirelessapplet.ts b/i18n/nl/libwirelessapplet.ts
new file mode 100644
index 0000000..b35d14d
--- a/dev/null
+++ b/i18n/nl/libwirelessapplet.ts
@@ -0,0 +1,29 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AdvancedConfigBase</name>
+    <message>
+        <source>Advanced Config</source>
+        <translation>Geavanceerde instellingen</translation>
+    </message>
+    <message>
+        <source>Renew DHCP on changing</source>
+        <translation>Vernieuw DHCP bij verandering</translation>
+    </message>
+    <message>
+        <source>Frequency</source>
+        <translation>Frequentie</translation>
+    </message>
+    <message>
+        <source>MODE</source>
+        <translation>MODE</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>AccessPoint</source>
+        <translation>Aansluitpunt</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libwlan.ts b/i18n/nl/libwlan.ts
new file mode 100644
index 0000000..a314b2b
--- a/dev/null
+++ b/i18n/nl/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>WiFi Configuratie</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Kies &amp;Access Point</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Specificeer &amp;kanaal</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>ieder</translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation>Infrastructuur</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Versleuteling</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>V&amp;ersleuteling inschakelen</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Sleutelinstelling</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Sleutel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Sleutel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Sleutel &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Sleutel &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Niet-versleutelde pakketten</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accepteer</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>Annulee&amp;r</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Verbindingsinformatie</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Kanaal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Snelheid</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Kwalitiet</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruis</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signaal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libwlanplugin.ts b/i18n/nl/libwlanplugin.ts
new file mode 100644
index 0000000..31f692d
--- a/dev/null
+++ b/i18n/nl/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Draadloos Instellingen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESS-ID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Specificeer &amp;Aansluitpunt</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Specificeer &amp;Kanaal</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Geregeld</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>iedere</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Versleuteling</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Zet Versleuteling aan</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>&amp;Sleutelinstelling</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Sleutel &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Sleutel &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Sleutel &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Sleutel &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Niet versleutelde pakketten</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Accepteer</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Weiger</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Interface informatie</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Kanaal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Mode</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Station</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>AP</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Snelheid</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Kwaliteit</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruis</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Signaal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/light-and-power.ts b/i18n/nl/light-and-power.ts
index 9c4d055..47060af 100644
--- a/i18n/nl/light-and-power.ts
+++ b/i18n/nl/light-and-power.ts
@@ -1,151 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Stappen</translation>
     </message>
 </context>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Licht- en Energieinstellingen</translation>
     </message>
     <message>
         <source>on Battery</source>
-        <translation type="unfinished"></translation>
+        <translation>op Batterij</translation>
     </message>
     <message>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Algemene instellingen</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sec</translation>
     </message>
     <message>
         <source>never</source>
-        <translation type="unfinished"></translation>
+        <translation>nooit</translation>
     </message>
     <message>
         <source>Light off after</source>
-        <translation type="unfinished"></translation>
+        <translation>Licht uit na</translation>
     </message>
     <message>
         <source>Dim light after</source>
-        <translation type="unfinished"></translation>
+        <translation>Licht laag na</translation>
     </message>
     <message>
         <source>Suspend after</source>
-        <translation type="unfinished"></translation>
+        <translation>Slaap na</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
+        <translation>Deactiveer alleen scherm (geen slaapstand)</translation>
     </message>
     <message>
         <source>Backlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Achtergrondlicht</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
+        <translation>stel een vaste waarde in voor achtergrondlicht</translation>
     </message>
     <message>
         <source>Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Uit</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Vol</translation>
     </message>
     <message>
         <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruik lichtsensor</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
+        <translation>Door het omgevingslicht te meten, kan de schermverlichting automatisch worden aangepast. De helderheidinstelling bepaalt nog steeds de gemiddelde lichtsterkte.</translation>
     </message>
     <message>
         <source>Calibrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalibreer</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
+        <translation>Geavanceerde instellingen voor lichtsensor</translation>
     </message>
     <message>
         <source>on AC</source>
-        <translation type="unfinished"></translation>
+        <translation>op Stroom</translation>
     </message>
     <message>
         <source>Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>Waarschuwingen</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Lage energiewaarschuwing interval</translation>
     </message>
     <message>
         <source> %</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
+        <translation>Bij welk energieniveau moet de waarschuwing starten</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
+        <translation>hoe vaak moet er gekeken worden naar het energieniveau. Dit bepaalt hoe vaak de waarschuwing voorkomt bij gebrek aan energie</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
+        <translation>Bij welk energieniveau moet de kritieke waarschuwing starten</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
+        <translation>Erg lage batterij waarschuwing bij</translation>
     </message>
     <message>
         <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
+        <translation>Kritieke lage batterij waarschuwing bij</translation>
     </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensorcalibratie</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Vol</translation>
     </message>
     <message>
         <source>Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Uit</translation>
     </message>
     <message>
         <source>Dark</source>
-        <translation type="unfinished"></translation>
+        <translation>Donker</translation>
     </message>
     <message>
         <source>Light</source>
-        <translation type="unfinished"></translation>
+        <translation>Licht</translation>
     </message>
     <message>
         <source>Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>Stappen</translation>
     </message>
     <message>
         <source>Check interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontroleer interval</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sec</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/mail.ts b/i18n/nl/mail.ts
new file mode 100644
index 0000000..38d3f09
--- a/dev/null
+++ b/i18n/nl/mail.ts
@@ -0,0 +1,905 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountEditor</name>
+    <message>
+        <source>Warning</source>
+        <translation>Waarschuwing</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Je handtekening is langer dan 4 regels. Dit wordt als onbeleefd gezien door veel mensen. Je zou je handtekening moeten verkorten.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Change</source>
+        <translation>Verander</translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation>Ga door</translation>
+    </message>
+</context>
+<context>
+    <name>AccountEditorBase</name>
+    <message>
+        <source>Account Editor</source>
+        <translation>Account editor</translation>
+    </message>
+    <message>
+        <source>Server</source>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Port:</source>
+        <translation>&lt;b&gt;Poort:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;IMAP:</source>
+        <translation>&lt;b&gt;IMAP:</translation>
+    </message>
+    <message>
+        <source>[--]</source>
+        <translation>[--]</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;SMTP:</source>
+        <translation>&lt;b&gt;SMTP:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;User:</source>
+        <translation>&lt;b&gt;Gebruiker:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Pass:</source>
+        <translation>&lt;b&gt;Wachtwoord:</translation>
+    </message>
+    <message>
+        <source>Identity</source>
+        <translation>Identiteit</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Name:</source>
+        <translation>&lt;b&gt;Naam:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;E-Mail:</source>
+        <translation>&lt;b&gt;E-Mail:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Org:</source>
+        <translation>&lt;b&gt;Org:</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Geavanceerd</translation>
+    </message>
+    <message>
+        <source>Cc</source>
+        <translation>Cc</translation>
+    </message>
+    <message>
+        <source>Bcc</source>
+        <translation>Bcc</translation>
+    </message>
+    <message>
+        <source>Reply-To</source>
+        <translation>Antwoord aan</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Signature:</source>
+        <translation>&lt;b&gt;Handtekening:</translation>
+    </message>
+    <message>
+        <source>SSL</source>
+        <translation>SSL</translation>
+    </message>
+    <message>
+        <source>IMAP</source>
+        <translation>IMAP</translation>
+    </message>
+    <message>
+        <source>Use SSL</source>
+        <translation>Gebruik SSL</translation>
+    </message>
+    <message>
+        <source>993</source>
+        <translation>993</translation>
+    </message>
+    <message>
+        <source>SMTP</source>
+        <translation>SMTP</translation>
+    </message>
+</context>
+<context>
+    <name>AddressPicker</name>
+    <message>
+        <source>There are no entries in the addressbook.</source>
+        <translation>Er zijn geen gegevens in adresboek.</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;U moet minimaal een adres ingevoerd hebben.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
+    <name>AddressPickerBase</name>
+    <message>
+        <source>Address Picker</source>
+        <translation>Adreskiezer</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleer</translation>
+    </message>
+</context>
+<context>
+    <name>Composer</name>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>Please select an entry first.</source>
+        <translation>Selecteer een keuze aub.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Set Description</source>
+        <translation>Stel omschrijving in</translation>
+    </message>
+    <message>
+        <source>&lt;div align=center&gt;Description</source>
+        <translation>&lt;div align=center&gt;Omschrijving</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;U moet een ontvanger ingeven.&lt;br&gt;(bv: foo@bar.org)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Er is een probleem bij het verzenden van de wachtrij met mails.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation>Succes</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
+        <translation>&lt;p&gt;De mail is succesvol in de wachtrij geplaatst&lt;/p&gt;&lt;p&gt;De wachtrij bevat</translation>
+    </message>
+    <message>
+        <source> mails.&lt;/p&gt;</source>
+        <translation>mails.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
+        <translation>&lt;font color=#ff0000&gt;Fout opgetreden tijdens zenden.&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1&lt;/p</source>
+        <translation>&lt;p&gt;%1&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;De mail is succesvol verzonden.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The queued mails </source>
+        <translation>&lt;p&gt;De mails in de wachtrij</translation>
+    </message>
+    <message>
+        <source> of </source>
+        <translation>van</translation>
+    </message>
+</context>
+<context>
+    <name>ComposerBase</name>
+    <message>
+        <source>Compose Message</source>
+        <translation>Maak bericht</translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation>Mail</translation>
+    </message>
+    <message>
+        <source>Send the mail</source>
+        <translation>Verstuur de mail</translation>
+    </message>
+    <message>
+        <source>Queue the mail</source>
+        <translation>Zet mail in wachtrij</translation>
+    </message>
+    <message>
+        <source>Attach a file</source>
+        <translation>Voeg bestand bij</translation>
+    </message>
+    <message>
+        <source>Addressbook</source>
+        <translation>Adresboek</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Van</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation>Antwoord</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Aan</translation>
+    </message>
+    <message>
+        <source>Cc</source>
+        <translation>Cc</translation>
+    </message>
+    <message>
+        <source>Bcc</source>
+        <translation>Bcc</translation>
+    </message>
+    <message>
+        <source>Subj.</source>
+        <translation>Onderw.</translation>
+    </message>
+    <message>
+        <source>Prio.</source>
+        <translation>Prio.</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Laag</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normaal</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Hoog</translation>
+    </message>
+    <message>
+        <source>Add an Attachement</source>
+        <translation>Voeg een bijlage in</translation>
+    </message>
+    <message>
+        <source>Remove Attachement</source>
+        <translation>Verwijder bijlage</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Omschrijving</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Hernoem</translation>
+    </message>
+    <message>
+        <source>Change Description</source>
+        <translation>Verander omschrijving</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDiag</name>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;U moet eerst een account selecteren.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation>Vraag</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Wilt u het geselecteerde account echt verwijderen?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDiagBase</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configutratie</translation>
+    </message>
+    <message>
+        <source>Accounts</source>
+        <translation>Accounts</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Wijzig</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>[Hidden]</source>
+        <translation>[Verborgen]</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Mail notification</source>
+        <translation>Mail notificatie</translation>
+    </message>
+    <message>
+        <source>Blink LED</source>
+        <translation>Knipper LED</translation>
+    </message>
+    <message>
+        <source>Play sound</source>
+        <translation>Maak geluid</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Check&amp;nbsp;every</source>
+        <translation>&lt;b&gt;Controleer&amp;nbsp;iedere</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>nim</translation>
+    </message>
+    <message>
+        <source>Disable mail notification</source>
+        <translation>Schakel mailnotificatie uit</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
+Sponsored and Programmed by LISAsystems&lt;br&gt;
+Visit http://www.lisa.de/ for Information.
+                            </source>
+        <translation>&lt;p&gt;&lt;b&gt;Mail versie %1&lt;/b&gt;&lt;hr&gt;
+Gesponsord and Geprogrammeerd door LISAsystems&lt;br&gt;
+Ga naar http://www.lisa.de/ voor informatie.</translation>
+    </message>
+</context>
+<context>
+    <name>FolderWidget</name>
+    <message>
+        <source>Rename</source>
+        <translation>Hernoem</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Move</source>
+        <translation>Verplaats</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopieer</translation>
+    </message>
+    <message>
+        <source>Create folder</source>
+        <translation>Maak map</translation>
+    </message>
+    <message>
+        <source>Rescan folder list</source>
+        <translation>Vernieuw mappenlijst</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Selecteer eerst een item aub.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation>Vraag</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
+        <translation>&lt;p&gt;Wil je echt &lt;pre&gt;%1&lt;/pre&gt; verwijderen?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>Foldername</source>
+        <translation>Mapnaam</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Voer de naam van de nieuwe map in aub.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Looking up host...</source>
+        <translation>Host opzoeken...</translation>
+    </message>
+    <message>
+        <source>Host found.</source>
+        <translation>Host gevonden.</translation>
+    </message>
+    <message>
+        <source>Connected to host.</source>
+        <translation>Verbonden met host.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;De IMAP verbinding is geweigerd.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;De host is niet gevonden.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Er was een fout bij het lezen van de bron.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Inloggen mislukt. Controleer uw gebruikersnaam/wachtwoord.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Een onbekende fout is opgetreden.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Disconnected.</source>
+        <translation>Verbinding verbroken.</translation>
+    </message>
+    <message>
+        <source>Login successfull!</source>
+        <translation>Inloggen succesvol!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Inloggen mislukt. Ga weg!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Renaming successfull!</source>
+        <translation>Hernoemen succesvol!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Hernoemen mislukt. (Zerver zei: %1)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Deletion successfull!</source>
+        <translation>Verwijderen succesvol!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Verwijderen mislukt. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Folder created. Rescanning...</source>
+        <translation>Map aangemaakt. Vernieuwen...</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Map maken mislukt. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Kan mapcache bestand niet wijzigen!&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Got folder list.</source>
+        <translation>Mappenlijst opgehaald.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Mappenlijst ophalen mislukt. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>MailTable</name>
+    <message>
+        <source>From</source>
+        <translation>Van</translation>
+    </message>
+    <message>
+        <source>Subject</source>
+        <translation>Onderwerp</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopie</translation>
+    </message>
+    <message>
+        <source>Seen</source>
+        <translation>Gezien</translation>
+    </message>
+    <message>
+        <source>Unseen</source>
+        <translation>Niet gezien</translation>
+    </message>
+    <message>
+        <source>Marked</source>
+        <translation>Gemarkeerd</translation>
+    </message>
+    <message>
+        <source>Unmarked</source>
+        <translation>Ongemarkeerd</translation>
+    </message>
+    <message>
+        <source>Mark as...</source>
+        <translation>Markeer als...</translation>
+    </message>
+    <message>
+        <source>Delete Mail</source>
+        <translation>Verwijder mail</translation>
+    </message>
+    <message>
+        <source>Mailbox contained no mails.</source>
+        <translation>Mailbox bavat geen mails.</translation>
+    </message>
+    <message>
+        <source>Getting mail headers...</source>
+        <translation>Ophalen mailheaders...</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Fout opgetreden tijdens het selecteren van de mailbox. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Stopped</source>
+        <translation>Gestopt</translation>
+    </message>
+    <message>
+        <source>Got all mail headers.</source>
+        <translation>Mailheaders opgehaald.</translation>
+    </message>
+    <message>
+        <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
+        <translation>&lt;font color=#ff0000&gt;Kan mail niet ophalen.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowBase</name>
+    <message>
+        <source>E-Mail</source>
+        <translation>E-Mail</translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation>Mail</translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation>Servers</translation>
+    </message>
+    <message>
+        <source>Compose new mail</source>
+        <translation>Maak nieuwe mail</translation>
+    </message>
+    <message>
+        <source>Send queued mails</source>
+        <translation>Verzend mailwachtrij</translation>
+    </message>
+    <message>
+        <source>Show/hide folders</source>
+        <translation>Verbergen/Laten Zien van mappen</translation>
+    </message>
+    <message>
+        <source>Search mails</source>
+        <translation>Zoek mails</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuratie</translation>
+    </message>
+</context>
+<context>
+    <name>OpenDiagBase</name>
+    <message>
+        <source>Open file...</source>
+        <translation>Open bestand...</translation>
+    </message>
+    <message>
+        <source> Stop </source>
+        <translation>Stop</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
+        <translation>&lt;b&gt;%1&lt;/b&gt; kB van &lt;b&gt;%2&lt;/b&gt; kB met &lt;b&gt;%3&lt;/b&gt; kB/s</translation>
+    </message>
+    <message>
+        <source>[Icon]</source>
+        <translation>[Icoon]</translation>
+    </message>
+    <message>
+        <source>&lt;i&gt;application/v-card</source>
+        <translation>&lt;i&gt;prograama/v-kaart</translation>
+    </message>
+    <message>
+        <source>Open using an application</source>
+        <translation>Open met programma</translation>
+    </message>
+    <message>
+        <source>Save to disk</source>
+        <translation>Sla op op disk</translation>
+    </message>
+    <message>
+        <source>Display</source>
+        <translation>Geef weer</translation>
+    </message>
+    <message>
+        <source>Save to</source>
+        <translation>Sla op naar</translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation>RAM</translation>
+    </message>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>(no name)</source>
+        <translation>(geen naam)</translation>
+    </message>
+    <message>
+        <source>&lt;Foldertree not known.&gt;</source>
+        <translation>&lt;mappenboom niet bekend.&gt;</translation>
+    </message>
+    <message>
+        <source>Inbox</source>
+        <translation>Inbox</translation>
+    </message>
+    <message>
+        <source>(no from)</source>
+        <translation>(geen van)</translation>
+    </message>
+    <message>
+        <source>(no subject)</source>
+        <translation>(geen onderwerp)</translation>
+    </message>
+    <message>
+        <source>(no date)</source>
+        <translation>(geen datum)</translation>
+    </message>
+</context>
+<context>
+    <name>RenameBase</name>
+    <message>
+        <source>Renaming</source>
+        <translation>Hernoemen</translation>
+    </message>
+    <message>
+        <source>&lt;div align=center&gt;Renaming</source>
+        <translation>&lt;div align=center&gt;Hernoemen</translation>
+    </message>
+    <message>
+        <source>&lt;div align=center&gt;to</source>
+        <translation>&lt;div align=center&gt;naar</translation>
+    </message>
+</context>
+<context>
+    <name>SearchDiag</name>
+    <message>
+        <source>Body</source>
+        <translation>Inhoud</translation>
+    </message>
+    <message>
+        <source>Header Field</source>
+        <translation>Titelveld</translation>
+    </message>
+    <message>
+        <source>Subject</source>
+        <translation>Onderwerp</translation>
+    </message>
+    <message>
+        <source>From</source>
+        <translation>Van</translation>
+    </message>
+    <message>
+        <source>To</source>
+        <translation>Naar</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Voer zoekterm in aub.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Selecteer een map aub.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Selecteer een titelveld om in te zoeken&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
+        <translation>&lt;p&gt;Kan map niet selecteren. Afbreken. (Server zei: %1)</translation>
+    </message>
+    <message>
+        <source>Results</source>
+        <translation>Resultaten</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Geen mails voldoen aan zoekopdracht.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Search failed. (Server said: %1)</source>
+        <translation>&lt;p&gt;Zoeken mislukt. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
+        <translation>&lt;p&gt;Ophalen titelvelden mails mislukt. (Server zei: %1)&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>SearchDiagBase</name>
+    <message>
+        <source>Mail Search</source>
+        <translation>Mail zoeken</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Search&amp;nbsp;in:</source>
+        <translation>&lt;b&gt;Zoek&amp;nbsp;in:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;For:</source>
+        <translation>&lt;b&gt;naar:</translation>
+    </message>
+</context>
+<context>
+    <name>ViewMail</name>
+    <message>
+        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;Van:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Naar:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Datum:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <source>(no subject)</source>
+        <translation>(geen onderwerp)</translation>
+    </message>
+    <message>
+        <source>(no from)</source>
+        <translation>(geen naam)</translation>
+    </message>
+    <message>
+        <source>(no recipient)</source>
+        <translation>(geen ontvanger)</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
+        <translation>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
+        <translation>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>(no date)</source>
+        <translation>(geen datum)</translation>
+    </message>
+    <message>
+        <source>Getting mail body from server. Please wait...</source>
+        <translation>Haal gehele mail van server. Wachten aub...</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
+        <translation>&lt;p&gt;De inhoud van de mail is nog niet opgehaald, dus u kunt nog niet antwoorden.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
+        <translation>&lt;p&gt;De inhoud van de mail is nog niet opgehaald, dus u kunt nog niet doorsturen.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Kon de mail niet van de server ophalen. Probeer het later nog eens of geef het op.&lt;/p&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ViewMailBase</name>
+    <message>
+        <source>E-Mail by %1</source>
+        <translation>Email door %1</translation>
+    </message>
+    <message>
+        <source>Mail</source>
+        <translation>Mail</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <translation>Antwoord</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Doorsturen</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Bijlagen</translation>
+    </message>
+    <message>
+        <source>Delete Mail</source>
+        <translation>Verwijder mail</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/mediummount.ts b/i18n/nl/mediummount.ts
index 77a2879..cea0784 100644
--- a/i18n/nl/mediummount.ts
+++ b/i18n/nl/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Medium Mount Instellingen</translation>
     </message>
     <message>
         <source>Global</source>
-        <translation type="unfinished"></translation>
+        <translation>Globaal</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>Als een medium ingevoerd wordt, probeert Opie het medium te onderzoeken naar Documenten. Bij grote media kan dit enige tijd duren. U kunt kiezen of Opie globaal of per medium moet zoeken. U kunt ook ieder medium apart instellen.</translation>
     </message>
     <message>
         <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Zet mediumcontrole aan</translation>
     </message>
     <message>
         <source>Use global settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebruik globale instellingen</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>Configureer dit medium. De veranderen treden in werking zodra dit programma gesloten wordt. Om het Documenten tabblad te updaten moet u het medium verwijeren en opnieuw invoeren.</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Limiteer zoeken met:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Controleer dit medium altijd</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/networksettings.ts b/i18n/nl/networksettings.ts
index db235c8..d699daf 100644
--- a/i18n/nl/networksettings.ts
+++ b/i18n/nl/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>voeg netwerkconnectie toe</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancel</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Voeg toe</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Diensten</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Netwerkinstellingen</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Verbindingen</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Voeg toe</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Informatie</translation>
+        <translation type="obsolete">&amp;Informatie</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Configureer</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Verwijder</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Profielen</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation>&amp;Stel huidige in</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Huidig profiel</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Nieuw profiel</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Een lijst net netwerkinstellingen om uit te kiezen</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Voeg een nieuwe verbinding toe.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Start/Stop</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Start en stop de huidige verbinding, geeft meer info over de verbinding.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Stel de huidige verbinding in</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Verwijder de huidige verbinding van de lijst.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Verbroken</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Kan niet verwijderen.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Sorry</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Selecteer eerst een verbinding.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/odict.ts b/i18n/nl/odict.ts
index 5b587d8..e89c4da 100644
--- a/i18n/nl/odict.ts
+++ b/i18n/nl/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opties</translation>
     </message>
     <message>
         <source>Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoekmethode</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <source>New</source>
+        <translation>Nieuw</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <source>Change</source>
+        <translation>Verander</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>OPIE-Woordenboek</translation>
     </message>
     <message>
         <source>Query:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoekopdr:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoekmethoden</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hoofdlettergevoelig</translation>
     </message>
     <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Parameter</source>
+        <translation>Parameter</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>No dictionary defined</source>
+        <translation>Geen woordenboek gedefinieerd</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definieer</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuleer</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Configuration</source>
+        <translation>Configuratie</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation type="unfinished"></translation>
+        <source>Opie-Dictionary</source>
+        <translation>Opie-Woordenboek</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Naam:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation type="unfinished"></translation>
+        <translation>Woordenboekbestand</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Blader</translation>
     </message>
     <message>
         <source>Language 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Taal 1</translation>
     </message>
     <message>
         <source>Decollator</source>
-        <translation type="unfinished"></translation>
+        <translation>Decollator</translation>
     </message>
     <message>
         <source>Language 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Taal 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuwe zoekmethode</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Verander zoekmethode</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/oipkg.ts b/i18n/nl/oipkg.ts
deleted file mode 100644
index 1f93af3..0000000
--- a/i18n/nl/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/nl/opie-console.ts b/i18n/nl/opie-console.ts
index 9cdeb11..b85e186 100644
--- a/i18n/nl/opie-console.ts
+++ b/i18n/nl/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Belparameter instellingen</translation>
     </message>
     <message>
         <source>Settings1</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellingen1</translation>
     </message>
     <message>
         <source>Settings2</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellingen2</translation>
     </message>
     <message>
         <source>Init string </source>
-        <translation type="unfinished"></translation>
+        <translation>Init string</translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation type="unfinished"></translation>
+        <translation>Reset string</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belvoorvoegsel #1</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belachtervoegsel #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belvoorvoegsel #2</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belachtervoegsel #2</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belvoorvoegsel #3</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Belachtervoegsel #3</translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation type="unfinished"></translation>
+        <translation>Connectie string</translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
+        <translation>Ophang string</translation>
     </message>
     <message>
         <source>Dial time </source>
-        <translation type="unfinished"></translation>
+        <translation>Kies tijd</translation>
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
+        <translation>Vertraging voor kiezen</translation>
     </message>
     <message>
         <source>Number of tries </source>
-        <translation type="unfinished"></translation>
+        <translation>Aantal pogingen</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
+        <translation>DTR stop tijd (0=geen)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
+        <translation>Auto bps detectie</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nee</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
+        <translation>Modem heeft DCD regel</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
+        <translation>Multi-line untag</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Apparaat</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
-        <translation type="unfinished"></translation>
+        <translation>Of te koppelen MAC adres</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>Wijzig Connectieprofiel</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Nieuwe verbinding</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Configureer</translation>
     </message>
     <message>
         <source>Profile Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Profielnaam</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Voeg toe</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wijzig</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>V&amp;erwijder</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Uit te voeren commando</translation>
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Omgevingsvariabelen</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Naam</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Waarde</translation>
     </message>
     <message>
         <source>Name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Naam:</translation>
     </message>
     <message>
         <source>Value :</source>
-        <translation type="unfinished"></translation>
+        <translation>Waarde:</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg toe</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer nummer in</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer het nummer dat je wilt bellen in. Druk Ok indien gereed</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor Base</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminalemulatie:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
+        <translation>IO Laag:</translation>
     </message>
     <message>
         <source>Look</source>
-        <translation type="unfinished"></translation>
+        <translation>Kijk</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="unfinished"></translation>
+        <translation>Voorgrond:</translation>
     </message>
     <message>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Zwart</translation>
     </message>
     <message>
         <source>White</source>
-        <translation type="unfinished"></translation>
+        <translation>Wit</translation>
     </message>
     <message>
         <source>Gray</source>
-        <translation type="unfinished"></translation>
+        <translation>Grijs</translation>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="unfinished"></translation>
+        <translation>Achtergrond:</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lettertype:</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished"></translation>
+        <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Klein</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Middel</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan niet starten</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan niet splitsen</translation>
     </message>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan niet starten</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensies</translation>
     </message>
     <message>
         <source>Edit Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzig sleutel</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Snelheid</translation>
     </message>
     <message>
         <source>Flow control</source>
-        <translation type="unfinished"></translation>
+        <translation>Flow control</translation>
     </message>
     <message>
         <source>Hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen</translation>
     </message>
     <message>
         <source>Parity</source>
-        <translation type="unfinished"></translation>
+        <translation>Pariteit</translation>
     </message>
     <message>
         <source>Odd</source>
-        <translation type="unfinished"></translation>
+        <translation>Oneven</translation>
     </message>
     <message>
         <source>Even</source>
-        <translation type="unfinished"></translation>
+        <translation>Even</translation>
     </message>
     <message>
         <source>Data Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Data bits</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Stop bits</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
-        <translation type="unfinished"></translation>
+        <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>115200 baud</translation>
     </message>
     <message>
         <source>57600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>57600 baud</translation>
     </message>
     <message>
         <source>38400 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>38400 baud</translation>
     </message>
     <message>
         <source>19200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>19200 baud</translation>
     </message>
     <message>
         <source>9600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>9600 baud</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Niet verbonden</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Foutieve baud snelheid</translation>
     </message>
     <message>
         <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Apparaat is al verbonden</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Apparaat</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Configureer profielen</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Save Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Sal verbinding op</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbind</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbreek</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
+        <translation>SnelStarten</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
+        <translation>Te shell knop start het &quot;standaard&quot; profiel. Als er geen is worden standaardwaarden genomen</translation>
     </message>
     <message>
         <source>Transfer file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzend bestand...</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Lijnafbreking</translation>
     </message>
     <message>
         <source>Full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Volledig scherm</translation>
     </message>
     <message>
         <source>Save history</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla historie op</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Beeindig</translation>
     </message>
     <message>
         <source>Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit venster</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Speel script af</translation>
     </message>
     <message>
         <source>Record Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Neem script op</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla script op</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
-        <translation type="unfinished"></translation>
+        <translation>Open toetsenbord...</translation>
     </message>
     <message>
         <source>New from Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw van profiel</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation type="unfinished"></translation>
+        <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieer</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Plak</translation>
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Er is geen verbinding.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschiedenis</translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nieuw Profiel</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation>Bewaar Profiel</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem is verbonden met:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer telefoonnummer hier in:</translation>
     </message>
     <message>
         <source>AT commands</source>
-        <translation type="unfinished"></translation>
+        <translation>AT commando&apos;s</translation>
     </message>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer nummer in</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Deze plugin ondersteunt geen configuraties</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
+        <translation>Autoconnect na laden</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Console</translation>
+    </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Nieuw Profiel</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Console</translation>
     </message>
     <message>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mislukt</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding mislukt voor deze sessie.</translation>
     </message>
     <message>
         <source>Session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sessie mislukt</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kan sessie niet openen: Niet alle componenten zijn gevonden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzendingsmodus</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Ontvang</translation>
     </message>
     <message>
         <source>Send file</source>
-        <translation type="unfinished"></translation>
+        <translation>Zend bestand</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzendingsprotocol</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Voortgang</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Klaar</translation>
     </message>
     <message>
         <source>Start transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Start verzenden</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuleer</translation>
     </message>
     <message>
         <source>File transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestandsverzending</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation type="unfinished"></translation>
+        <translation>Attentie</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen bestand is gekozen.</translation>
     </message>
     <message>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zenden...</translation>
     </message>
     <message>
         <source>Receiving...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ontvangen...</translation>
     </message>
     <message>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Geannuleerd</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>De bestandsverzending is geannuleerd.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktie niet ondersteund.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzending kan niet worden gestart.</translation>
     </message>
     <message>
         <source>No error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen fout.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ongedefinieerde fout opgetreden.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Incomplete verzending.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekende fout opgetreden.</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Verzonden</translation>
     </message>
     <message>
         <source>File has been sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand is verzonden.</translation>
     </message>
     <message>
         <source>Received</source>
-        <translation type="unfinished"></translation>
+        <translation>Ontvangen</translation>
     </message>
     <message>
         <source>File has been received.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand is ontvangen.</translation>
     </message>
     <message>
         <source>Profile name</source>
-        <translation type="unfinished"></translation>
+        <translation>Profielnaam</translation>
     </message>
     <message>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profiel</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Speciale toetsen</translation>
     </message>
     <message>
         <source>Invalid profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout profiel</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer een profielnaam in aub.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation>Serieel</translation>
     </message>
     <message>
         <source>Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale console</translation>
     </message>
     <message>
         <source>Default Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaard terminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaard toetsenbord</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesynchroniseerd bestand</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Bel nummer: %1</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Mislukking</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bellen van nummer mislukt.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Afbreken...</translation>
     </message>
     <message>
         <source>Searching modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoeken modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialiseren...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
+        <translation>Herstel speakers</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Schakel beltoon uit</translation>
     </message>
     <message>
         <source>Dial number</source>
-        <translation type="unfinished"></translation>
+        <translation>Te bellen nummer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
-        <translation type="unfinished"></translation>
+        <translation>Lijn bezet, opnieuw inbellen</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding gemaakt</translation>
     </message>
     <message>
         <source>Dismiss</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit af</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Apparaat</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal type</translation>
     </message>
     <message>
         <source>Color scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Kleurschema</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Lettertypegrootte</translation>
     </message>
     <message>
         <source>small</source>
-        <translation type="unfinished"></translation>
+        <translation>klein</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>middel</translation>
     </message>
     <message>
         <source>large</source>
-        <translation type="unfinished"></translation>
+        <translation>groot</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
+        <translation>Regelovergangsconversies</translation>
     </message>
     <message>
         <source>Inbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Inkomend</translation>
     </message>
     <message>
         <source>Outbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Uitgaand</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opties</translation>
     </message>
     <message>
         <source>Local echo</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Lijnafbreking</translation>
     </message>
     <message>
         <source>VT 100</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Linux console</translation>
     </message>
     <message>
         <source>X-Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>X_Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
-        <translation type="unfinished"></translation>
+        <translation>zwart op wit</translation>
     </message>
     <message>
         <source>white on black</source>
-        <translation type="unfinished"></translation>
+        <translation>wit op zwart</translation>
     </message>
     <message>
         <source>green on black</source>
-        <translation type="unfinished"></translation>
+        <translation>groen op zwart</translation>
     </message>
     <message>
         <source>orange on black</source>
-        <translation type="unfinished"></translation>
+        <translation>oranje op zwart</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/opie-login.ts b/i18n/nl/opie-login.ts
index 50c06d1..1c1ca0f 100644
--- a/i18n/nl/opie-login.ts
+++ b/i18n/nl/opie-login.ts
@@ -1,83 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Raak de kruisjes precies aan om het scherm te calibreren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Log in</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Welkom bij OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Slaapstand</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Herstart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Onjuist wachtwoord</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Het opgegeven wachtwoord is onjuist.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>OPIE is gestopt door een onverwacht signaal: (%1)</translation>
+        <translation type="obsolete">OPIE is gestopt door een onverwacht signaal: (%1)</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Gefaald</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>Kan OPIE niet starten</translation>
+        <translation type="obsolete">Kan OPIE niet starten</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Kan niet overschakelen naar nieuwe User</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>Opie werd afgebroken
+door een onbruikbaar
+signaal (%1)
+</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>Kan Opie niet starten.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/opieirc.ts b/i18n/nl/opieirc.ts
index 33ef781..23903da 100644
--- a/i18n/nl/opieirc.ts
+++ b/i18n/nl/opieirc.ts
@@ -1,510 +1,556 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Spreek op kanaal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanaaldiscussie</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Type hier je bericht om aan de discussie in het kanaal deel te nemen</translation>
     </message>
     <message>
         <source>CTCP</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
-        <translation type="unfinished"></translation>
+        <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versie</translation>
     </message>
     <message>
         <source>Whois</source>
-        <translation type="unfinished"></translation>
+        <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbonden, log nu in...</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Succcesvol ingelogd.</translation>
     </message>
     <message>
         <source>Socket error : </source>
-        <translation type="unfinished"></translation>
+        <translation>Socket error:</translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ongebruikt nummeriek commando ontvangen:</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ongebruikt ctcp commando ontvangen:</translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ongebruikt tekstueel commando ontvangen:</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Niet bestaand kanaal openen - synchronisatie verloren?</translation>
     </message>
     <message>
         <source> joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">opent kanaal</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Persoon heeft kanaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>U heeft het knaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>You left channel </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">U verliet het kanaal</translation>
     </message>
     <message>
         <source> left channel </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">verliet kanaal</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vertrekken persoon niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Te verlaten kanaal niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanaalbericht van onbekende afzender</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Kanaalbericht voor onbekend kanaal</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekende PRIVMSG ontvangen</translation>
     </message>
     <message>
         <source>You are now known as </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">U staat nu bekend als</translation>
     </message>
     <message>
         <source> is now known as </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">staat nu bekend als</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijnaamverandering van een onbekend persoon</translation>
     </message>
     <message>
         <source> has quit </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">is gestopt</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekend persoon is gestopt - synchronisatie verloren?</translation>
     </message>
     <message>
         <source> changed topic to </source>
-        <translation type="unfinished"></translation>
+        <translation>veranderde onderwerp in</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekend kanaalonderwerp - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP PING ontvangen van</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP VERSION ontvangen van</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION met slechte ontvanger</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Modus is van onbekend type</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Modusverandering met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
-        <translation type="unfinished"></translation>
+        <translation>Modusverandering met onbekende vlag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Modusverandering met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
-        <translation type="unfinished"></translation>
+        <translation>User modes worden nog niet ondersteund</translation>
     </message>
     <message>
         <source>You were kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>U werd ge-kick-t van</translation>
     </message>
     <message>
         <source> by </source>
-        <translation type="unfinished"></translation>
+        <translation>door</translation>
     </message>
     <message>
         <source> was kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>is ge-kick-t van</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekend persoon is ge-kick-t - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Onbekende kick op kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverbericht voor onbekend kanaal</translation>
     </message>
     <message>
         <source>You joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>U opent kanaal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijnaam is in gebruik, sluit opnieuw aan met een andere bijnaam</translation>
     </message>
     <message>
         <source>No such nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijnaam niet bekend</translation>
+    </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Ongebruikt nummeriek commando ontvangen: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Ongebruikt CTCP commando ontvangen: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Ongebruikt Tekstueel commando ontvangen: %1</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>%1 opent kanaal %2</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>U verlaat kanaal %1</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>%1 verlaat kanaal %2</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>Kanaalbericht voor onbekend kanaal %1</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>U staat nu bekend als %1</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 staat nu bekend als %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 is weggegaan (%2)</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
-        <translation type="unfinished"></translation>
+        <translation>Spreek met</translation>
     </message>
     <message>
         <source>Private discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Privegesprek</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
-        <translation type="unfinished"></translation>
+        <translation>Type je tekst hier om een bericht aan de andere persoon te zenden</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding verbroken</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Profielnaam:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
-        <translation type="unfinished"></translation>
+        <translation>De naam van dit serverprofiel in het overzicht</translation>
     </message>
     <message>
         <source>Hostname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostnaam:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>De server om mee te verbinden - kan iedere geldige hostnaam of IP adres zijn</translation>
     </message>
     <message>
         <source>Port :</source>
-        <translation type="unfinished"></translation>
+        <translation>Poort:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
-        <translation type="unfinished"></translation>
+        <translation>De serverpoort om mee te verbinden. Gewoonlijk 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijnaam:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
-        <translation type="unfinished"></translation>
+        <translation>Je naam op het IRC netwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Echte naam:</translation>
     </message>
     <message>
         <source>Your real name</source>
-        <translation type="unfinished"></translation>
+        <translation>Uw echte naam</translation>
     </message>
     <message>
         <source>Password :</source>
-        <translation type="unfinished"></translation>
+        <translation>Wachtwoord:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wachtwoord om met de server te verbinden (indien nodig)</translation>
     </message>
     <message>
         <source>Channels :</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalen:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Komma-gescheiden (CSV) lijst van kanalen die je je automatisch wilt aansluiten</translation>
     </message>
     <message>
         <source>Edit server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzig serverinformatie</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>Profile name required</source>
-        <translation type="unfinished"></translation>
+        <translation>Profielnaam vereist</translation>
     </message>
     <message>
         <source>Host name required</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostnaam vereist</translation>
     </message>
     <message>
         <source>Port required</source>
-        <translation type="unfinished"></translation>
+        <translation>Poort vereist</translation>
     </message>
     <message>
         <source>Nickname required</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijnaam vereist</translation>
     </message>
     <message>
         <source>Realname required</source>
-        <translation type="unfinished"></translation>
+        <translation>Echte naam vereist</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>De kanaallijst moet een komma
+gescheiden lijst met kanaalnamen
+bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverlijst browser</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Kies een serverprofiel</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecteer een severprofiel uit de lijst en druk dan op OK in de hoek rechtsboven</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Wijzig</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder het geselecteerde serverprofiel</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Verander het geselecteerde serverprofiel</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg een nieuw serverprofiel in</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinding met</translation>
     </message>
     <message>
         <source>Server messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverberichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ commando&apos;s hier in. Een lijst met commando&apos;s kan worden gevonden in OpieIRC help</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
-        <translation type="unfinished"></translation>
+        <translation>Weergegeven lijnen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
-        <translation type="unfinished"></translation>
+        <translation>Aantal lijnen die worden weergegeven voordat oude lijnen worden verwijderd - dit is nodig om geheugengebruik te beperken. Stel in op 0 als dit niet nodig is</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Algemeen</translation>
     </message>
     <message>
         <source>Background color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Achtergrondkleur:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>De te gebruiken achtergrondkleur in chats</translation>
     </message>
     <message>
         <source>Normal text color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale tekstkleur:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>De te gebruiken tekstkleur in chats</translation>
     </message>
     <message>
         <source>Error color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Foutkleur:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur om te gebruiken om fouten weer te geven</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
-        <translation type="unfinished"></translation>
+        <translation>Door jezelf geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur om je eigengeschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by others :</source>
-        <translation type="unfinished"></translation>
+        <translation>Door anderen geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur om door anderen geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
-        <translation type="unfinished"></translation>
+        <translation>Door de server geschreven tekst:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur om door de server geschreven tekst mee te herkennen</translation>
     </message>
     <message>
         <source>Notifications :</source>
-        <translation type="unfinished"></translation>
+        <translation>Berichtgevingen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekstkleur om te gebruiken om berichtgevingen weer te geven</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Kleuren</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
-        <translation type="unfinished"></translation>
+        <translation>Missende omschrijving</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
-        <translation type="unfinished"></translation>
+        <translation>Beschrijving van de inhoud van deze tab</translation>
     </message>
     <message>
         <source>Close this tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit deze tab</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC Client</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
+        <translation>Serververbindingen, kanalen, quieries en andere dingen worden hier geplaatst</translation>
     </message>
     <message>
         <source>IRC</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuwe verbinding</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak een nieuwe verbinding met een IRC server</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellingen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel OpieIRC&apos;s gedrag en uiterlijk in</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/opieplayer.ts b/i18n/nl/opieplayer.ts
new file mode 100644
index 0000000..7918da5
--- a/dev/null
+++ b/i18n/nl/opieplayer.ts
@@ -0,0 +1,274 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioDevice</name>
+    <message>
+        <source>Somethin&apos;s wrong with
+your sound device.
+open(&quot;/dev/dsp&quot;)
+</source>
+        <translation>Er is iets mis met uw
+audio-apparaat.
+open (&quot;/dev/dsp&quot;)
+</translation>
+    </message>
+    <message>
+        <source>
+
+Closing player now.</source>
+        <translation>Speler wordt gesloten.</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbreken</translation>
+    </message>
+</context>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation>OpieSpeler</translation>
+    </message>
+</context>
+<context>
+    <name>MediaPlayer</name>
+    <message>
+        <source>No file</source>
+        <translation>Geen fout</translation>
+    </message>
+    <message>
+        <source>Error: There is no file selected</source>
+        <translation>Fout: Er is geen bestand geselecteerd</translation>
+    </message>
+    <message>
+        <source>File not found</source>
+        <translation>Bestand niet gevonden</translation>
+    </message>
+    <message>
+        <source>The following file was not found: &lt;i&gt;</source>
+        <translation>Het volgende bestand is niet gevonden: &lt;i&gt;</translation>
+    </message>
+    <message>
+        <source>No decoder found</source>
+        <translation>Geen decoder gevonden</translation>
+    </message>
+    <message>
+        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
+        <translation>Sorry, geen passende decoder gevonden voor bestand: &lt;i&gt;</translation>
+    </message>
+    <message>
+        <source>Error opening file</source>
+        <translation>Fout bij openen van bestand</translation>
+    </message>
+    <message>
+        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
+        <translation>Sorry, er is een fout opgetreden bij het spelen van bestand: &lt;i&gt;</translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation>Bestand:</translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation>, Lengte:</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation>Afspeellijst selectie</translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation>OpieSpeler</translation>
+    </message>
+    <message>
+        <source>Play Operations</source>
+        <translation>Speelberwerkingen</translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation>Voeg aan afspeellijst toe</translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation>Verwijder van afspeellijst</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Speel af</translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation>Willekeurige volgorde</translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation>Repeteer</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Bestand</translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation>Schoon lijst op</translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation>Voeg alle audio bestanden toe</translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation>Voeg alle video bestanden toe</translation>
+    </message>
+    <message>
+        <source>Add all files</source>
+        <translation>Voeg alle bestanden toe</translation>
+    </message>
+    <message>
+        <source>Save PlayList</source>
+        <translation>Sla afspeellijst op</translation>
+    </message>
+    <message>
+        <source>Open File or URL</source>
+        <translation>Open Bestand of URL</translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation>Herzoeken audiobestanden</translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation>Herzoeken videobestanden</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Bekijk</translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation>Volledig scherm</translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation>Schaal</translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation>Skins</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Verplaats omhoog</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Verplaats omlaag</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Titel</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation>Medium</translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation>Pad</translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation>Audio</translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation>Video</translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation>Lijsten</translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation>OpieSpeler:</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="obsolete">Plaatsgebrek</translation>
+    </message>
+    <message>
+        <source>There was a problem saving the playlist.
+Your playlist may be missing some entries
+the next time you start it.</source>
+        <translation type="obsolete">Er is een probleem bij het opslaan van de
+afspeellijst. De afspeellijst kan de vogende
+keer een aantal nummers missen.</translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation>Onjuist bestand</translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation>Er is een probleem bij het verkrijgen van het bestand.</translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation>Verwijder afspeellijst?</translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</source>
+        <translation>Wilt u deze afspeellijst
+echt verwijderen?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Eigenschappen</translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation>Speel geselecteerden</translation>
+    </message>
+    <message>
+        <source>Open file or URL</source>
+        <translation>Open bestand of URL</translation>
+    </message>
+    <message>
+        <source>Save m3u Playlist </source>
+        <translation>Sla m3u afspeellijst op</translation>
+    </message>
+</context>
+<context>
+    <name>VideoWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation>OpieSpeler</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/opierec.ts b/i18n/nl/opierec.ts
new file mode 100644
index 0000000..17cbf24
--- a/dev/null
+++ b/i18n/nl/opierec.ts
@@ -0,0 +1,211 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>Vooruit</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Achteruit</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>OpieOpname</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Bestanden</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation>Sample ratio</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>Limiteer grootte</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Ongelimiteerd</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>Bestandsmap</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>Aantal bits</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Uit</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>Wiening opslagruimte</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>U heeft gebrek aan
+opslagruimte of een
+kaart wordt niet herkend</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>seconden</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>Wil je het geselecteerde bestand
+echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fout</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>Kan bestand niet verwijderen.</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>Opieopname</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>Kies een bestand om af te spelen</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Notitie</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>Kan audiobestand niet openen.</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Speel af</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>Stuur via IR</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Hernoem</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>Beam via IR</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>IR verzonden.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>Opname</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Plaats</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>Golfvormcompressie (kleinere bestanden)</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>auto Stil</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>Stil</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Stop</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/osearch.ts b/i18n/nl/osearch.ts
new file mode 100644
index 0000000..ffab2ac
--- a/dev/null
+++ b/i18n/nl/osearch.ts
@@ -0,0 +1,143 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>OZoek</translation>
+    </message>
+    <message>
+        <source>adressbook</source>
+        <translation type="obsolete">adresboek</translation>
+    </message>
+    <message>
+        <source>todo</source>
+        <translation type="obsolete">tedoen</translation>
+    </message>
+    <message>
+        <source>datebook</source>
+        <translation type="obsolete">agenda</translation>
+    </message>
+    <message>
+        <source>applications</source>
+        <translation type="obsolete">programma&apos;s</translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="obsolete">documenten</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Zoek</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Zoek alles</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Hoofdlettergevoelig</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Gebruik jokertekens</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>De details van de huidige resultaten</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Voer hier de zoektermen in</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Programma&apos;s</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documenten</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Te-doen lijst</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Kalender</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Kontakten</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Resultaten</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>laat zien</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>verander</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>voer uit</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>open in bestandsmanager</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>open met</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>laat afgemaakte taken zien</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>laat vroegere gebeurtenissen zien</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>zoek in data</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Bestand:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Link:</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>MIMEtype:</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>zoek inhoud</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>zoek naar %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/oxygen.ts b/i18n/nl/oxygen.ts
index ff83875..c954ba3 100644
--- a/i18n/nl/oxygen.ts
+++ b/i18n/nl/oxygen.ts
@@ -1,561 +1,562 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Moleculair gewicht</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
+        <translation>Chemishe formule</translation>
     </message>
     <message>
         <source>Calculate</source>
-        <translation type="unfinished"></translation>
+        <translation>Bereken</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
+        <translation>Moleculair gewicht (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
+        <translation>Elementaire compositie (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>%1 u</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 pm</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 J</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>%1 K</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 K</translation>
     </message>
     <message>
         <source>Weight</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewicht</translation>
     </message>
     <message>
         <source>Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Blok</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Groep</translation>
     </message>
     <message>
         <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
+        <translation>Elektronegativiteit</translation>
     </message>
     <message>
         <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
+        <translation>Atoomradius</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
+        <translation>Ionisatieenergie</translation>
     </message>
     <message>
         <source>Density</source>
-        <translation type="unfinished"></translation>
+        <translation>Dichtheid</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Kookpunt</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Smeltpunt</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
-        <translation type="unfinished"></translation>
+        <translation>Zuurstof</translation>
     </message>
     <message>
         <source>PSE</source>
-        <translation type="unfinished"></translation>
+        <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Calculations</source>
-        <translation type="unfinished"></translation>
+        <translation>Berekeningen</translation>
     </message>
     <message>
         <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Waterstof</translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation type="unfinished"></translation>
+        <translation>Helium</translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation type="unfinished"></translation>
+        <translation>Lithium</translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation type="unfinished"></translation>
+        <translation>Beryllium</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation type="unfinished"></translation>
+        <translation>Boor</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation type="unfinished"></translation>
+        <translation>Koolstof</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Stikstof</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation type="unfinished"></translation>
+        <translation>Fluor</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation type="unfinished"></translation>
+        <translation>Neon</translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation type="unfinished"></translation>
+        <translation>Natrium</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation type="unfinished"></translation>
+        <translation>Magnesium</translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation type="unfinished"></translation>
+        <translation>Aluminium</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation type="unfinished"></translation>
+        <translation>Silicium</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
+        <translation>Fosfor</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation type="unfinished"></translation>
+        <translation>Zwavel</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation type="unfinished"></translation>
+        <translation>Chloor</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation type="unfinished"></translation>
+        <translation>Argon</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation type="unfinished"></translation>
+        <translation>Kalium</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation type="unfinished"></translation>
+        <translation>Calcium</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation type="unfinished"></translation>
+        <translation>Scandium</translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation type="unfinished"></translation>
+        <translation>Titaan</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanadium</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation type="unfinished"></translation>
+        <translation>Chroom</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation type="unfinished"></translation>
+        <translation>Mangaan</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation type="unfinished"></translation>
+        <translation>IJzer</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation type="unfinished"></translation>
+        <translation>Kobalt</translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation type="unfinished"></translation>
+        <translation>Nikkel</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation type="unfinished"></translation>
+        <translation>Koper</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation type="unfinished"></translation>
+        <translation>Zink</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation type="unfinished"></translation>
+        <translation>Gallium</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation type="unfinished"></translation>
+        <translation>Germanium</translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation type="unfinished"></translation>
+        <translation>Arseen</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleen</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation type="unfinished"></translation>
+        <translation>Broom</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation type="unfinished"></translation>
+        <translation>Krypton</translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rubidium</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation type="unfinished"></translation>
+        <translation>Strontium</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation type="unfinished"></translation>
+        <translation>Yttrium</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation type="unfinished"></translation>
+        <translation>Zirconium</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation type="unfinished"></translation>
+        <translation>Niobium</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
+        <translation>Molybdeen</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation type="unfinished"></translation>
+        <translation>Technetium</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruthenium</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rodium</translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation type="unfinished"></translation>
+        <translation>Palladium</translation>
     </message>
     <message>
         <source>Silver</source>
-        <translation type="unfinished"></translation>
+        <translation>Zilver</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation type="unfinished"></translation>
+        <translation>Cadmium</translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation type="unfinished"></translation>
+        <translation>Indium</translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation type="unfinished"></translation>
+        <translation>Tin</translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation type="unfinished"></translation>
+        <translation>Antimoon</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation type="unfinished"></translation>
+        <translation>Telluur</translation>
     </message>
     <message>
         <source>Iodine</source>
-        <translation type="unfinished"></translation>
+        <translation>Jood</translation>
     </message>
     <message>
         <source>Xenon</source>
-        <translation type="unfinished"></translation>
+        <translation>Xenon</translation>
     </message>
     <message>
         <source>Cesium</source>
-        <translation type="unfinished"></translation>
+        <translation>Cesium</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation type="unfinished"></translation>
+        <translation>Barium</translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
+        <translation>Lanthaan</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation type="unfinished"></translation>
+        <translation>Cerium</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
+        <translation>Praseodymium</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation type="unfinished"></translation>
+        <translation>Neodymium</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation type="unfinished"></translation>
+        <translation>Promethium</translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation type="unfinished"></translation>
+        <translation>Samarium</translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation type="unfinished"></translation>
+        <translation>Europium</translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Gadolinium</translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Terbium</translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
+        <translation>Dysprosium</translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation type="unfinished"></translation>
+        <translation>Holmium</translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Erbium</translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation type="unfinished"></translation>
+        <translation>Thulium</translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ytterbium</translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation type="unfinished"></translation>
+        <translation>Lutetium</translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation type="unfinished"></translation>
+        <translation>Hafnium</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation type="unfinished"></translation>
+        <translation>Tantaal</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation type="unfinished"></translation>
+        <translation>Wolfraam</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation type="unfinished"></translation>
+        <translation>Renium</translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation type="unfinished"></translation>
+        <translation>Osmium</translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation type="unfinished"></translation>
+        <translation>Iridium</translation>
     </message>
     <message>
         <source>Platinum</source>
-        <translation type="unfinished"></translation>
+        <translation>Platina</translation>
     </message>
     <message>
         <source>Gold</source>
-        <translation type="unfinished"></translation>
+        <translation>Goud</translation>
     </message>
     <message>
         <source>Mercury</source>
-        <translation type="unfinished"></translation>
+        <translation>Merkuur</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation type="unfinished"></translation>
+        <translation>Thallium</translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation type="unfinished"></translation>
+        <translation>Lood</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation type="unfinished"></translation>
+        <translation>Bismut</translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation type="unfinished"></translation>
+        <translation>Polonium</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation type="unfinished"></translation>
+        <translation>Astaat</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation type="unfinished"></translation>
+        <translation>Radon</translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation type="unfinished"></translation>
+        <translation>Francium</translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation type="unfinished"></translation>
+        <translation>Radium</translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Actinium</translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation type="unfinished"></translation>
+        <translation>Thorium</translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Protactinium</translation>
     </message>
     <message>
         <source>Uranium</source>
-        <translation type="unfinished"></translation>
+        <translation>Uranium</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation type="unfinished"></translation>
+        <translation>Neptunium</translation>
     </message>
     <message>
         <source>Plutonium</source>
-        <translation type="unfinished"></translation>
+        <translation>Plutonium</translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation type="unfinished"></translation>
+        <translation>Americium</translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation type="unfinished"></translation>
+        <translation>Curium</translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation type="unfinished"></translation>
+        <translation>Berkelium</translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation type="unfinished"></translation>
+        <translation>Californium</translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Einsteinium</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation type="unfinished"></translation>
+        <translation>Fremium</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendelevium</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation type="unfinished"></translation>
+        <translation>Nobelium</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
+        <translation>Lawrencium</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rutherfordium</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation type="unfinished"></translation>
+        <translation>Dubnium</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
+        <translation>Seaborgium</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation type="unfinished"></translation>
+        <translation>Nielsbohrium</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation type="unfinished"></translation>
+        <translation>Hahnium</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
+        <translation>Meitnerium</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
-        <translation type="unfinished"></translation>
+        <translation>Periodiek Systeem</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>FOUT:
+</translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Chemishe gegevens</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/parashoot.ts b/i18n/nl/parashoot.ts
index 0aa33b9..1adbd93 100644
--- a/i18n/nl/parashoot.ts
+++ b/i18n/nl/parashoot.ts
@@ -1,24 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ParaShoot</name>
     <message>
         <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
+        <translation>ParaShoot</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw Spel</translation>
     </message>
     <message>
         <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
+        <translation>Ronde: %1       Score: %2</translation>
     </message>
     <message>
         <source>       GAME OVER!
        Your Score:  %1
  Parachuters Killed: %2
         Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
+        <translation>GAME OVER!
+Uw Score:  %1
+Parachutisten: %2
+Accuratesse: %3%</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/patience.ts b/i18n/nl/patience.ts
new file mode 100644
index 0000000..c843b74
--- a/dev/null
+++ b/i18n/nl/patience.ts
@@ -0,0 +1,97 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CanvasCardWindow</name>
+    <message>
+        <source>Patience</source>
+        <translation>Patience</translation>
+    </message>
+    <message>
+        <source>Freecell</source>
+        <translation>Freecell</translation>
+    </message>
+    <message>
+        <source>Chicane</source>
+        <translation>Chicane</translation>
+    </message>
+    <message>
+        <source>Harp</source>
+        <translation>Harp</translation>
+    </message>
+    <message>
+        <source>Teeclub</source>
+        <translation>Teeclub</translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation>&amp;Spel</translation>
+    </message>
+    <message>
+        <source>&amp;Change Card Backs</source>
+        <translation type="obsolete">&amp;Verander achterkant kaarten</translation>
+    </message>
+    <message>
+        <source>&amp;Snap To Position</source>
+        <translation type="obsolete">&amp;Klem naar positie</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Instellingen</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;Over</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Speel</translation>
+    </message>
+    <message>
+        <source>Change Card Backs</source>
+        <translation type="obsolete">Verander achterkant kaarten</translation>
+    </message>
+    <message>
+        <source>Snap To Position</source>
+        <translation type="obsolete">Klem naar positie</translation>
+    </message>
+    <message>
+        <source>Turn One Card</source>
+        <translation type="obsolete">Draai een kaart</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>Turn Three Cards</source>
+        <translation type="obsolete">Draai drie kaarten</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Verander kaartillustratie</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Spring naar plaats</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Verander kaartillustratie</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Spring naar plaats</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Draai een kaart</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Draai drie kaarten</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/qpdf.ts b/i18n/nl/qpdf.ts
index 2f03c32..7da2f96 100644
--- a/i18n/nl/qpdf.ts
+++ b/i18n/nl/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
-        <translation type="unfinished"></translation>
+        <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak breedte passend</translation>
     </message>
     <message>
         <source>Fit to page</source>
-        <translation type="unfinished"></translation>
+        <translation>Maak pagina passend</translation>
     </message>
     <message>
         <source>50%</source>
-        <translation type="unfinished"></translation>
+        <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
-        <translation type="unfinished"></translation>
+        <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
-        <translation type="unfinished"></translation>
+        <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
-        <translation type="unfinished"></translation>
+        <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
-        <translation type="unfinished"></translation>
+        <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
-        <translation type="unfinished"></translation>
+        <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
-        <translation type="unfinished"></translation>
+        <translation>Open...</translation>
     </message>
     <message>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Volledig scherm</translation>
     </message>
     <message>
         <source>First page</source>
-        <translation type="unfinished"></translation>
+        <translation>Eerste pagina</translation>
     </message>
     <message>
         <source>Previous page</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorige pagina</translation>
     </message>
     <message>
         <source>Goto page...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ga naar pagina...</translation>
     </message>
     <message>
         <source>Next page</source>
-        <translation type="unfinished"></translation>
+        <translation>Volgende pagina</translation>
     </message>
     <message>
         <source>Last page</source>
-        <translation type="unfinished"></translation>
+        <translation>Laatste pagina</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Volgende</translation>
     </message>
     <message>
         <source>Goto page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ga naar pagina</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecteer van 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kon niet worden gevonden.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Bestand bestaat niet!</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation>Bestand bestaat niet!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 56f6b51..0294650 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -1,252 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation type="unfinished"></translation>
+        <translation>Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Raak de richtkruizen duidelijk en
+precies aan om het scherm in te stellen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Documenten</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation type="unfinished"></translation>
+        <translation>Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Lijstaanzicht</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
+        <translation>Batterijlading is kritiek!
+Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
+        <translation>Batterijlading is erg laag.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
+        <translation>De reservebatterijlading is erg laag.
+Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation type="unfinished"></translation>
+        <translation>visitekaartje</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informatie</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;De systeemdatum lijkt niet correct.
+(%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Batterijstatus</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Launcher</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Vinden documenten</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoeken documenten</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen programma</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 bestanden</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle types van bestand</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentaanzicht</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingeschakeld medium</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation type="unfinished"></translation>
+        <translation>Koppel programma&apos;s</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
+        <translation>Beperk zoeken tot map: (nog niet gebruikt)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>Uw beslissing word opgeslagen op het medium.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Vraag niet nogmaals voor dit medium</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Batterijstatus</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
+        <translation>Afsluiten...</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Beeindigen</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie beeindigen</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation type="unfinished"></translation>
+        <translation>Herstarten</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie herstarten</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation type="unfinished"></translation>
+        <translation>Afsluiten</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;
+Deze afsluitopties worden voornamelijk voor gebruik tijdens ontwikkeling en tests van het Opie systeem. In een normale omgeving zijn deze opties niet nodig.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuleren</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchronisatieverbinding</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
+        <translation>Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Een onbekend systeem probeert toegang te krijgen tot dit apparaat. Dit is normaal als dit de eerste keer is dat u synchroniseert.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"></translation>
+        <translation>Sta toe</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Kontakten&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Annuleren</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/reader.ts b/i18n/nl/reader.ts
index 3842246..a27ece5 100644
--- a/i18n/nl/reader.ts
+++ b/i18n/nl/reader.ts
@@ -1,308 +1,793 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
+        <source>Toolbar Settings</source>
+        <translation>Taakbalkinstellingen</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
+        <source>File</source>
+        <translation>Bestand</translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
+        <source>Navigation</source>
+        <translation>Navigatie</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Bekijk</translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation>Markeringen</translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation>Indicators</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>Beleid</translation>
     </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
     <message>
-        <source>On Action...</source>
-        <translation type="unfinished"></translation>
+        <source>Scroll Speed</source>
+        <translation>Scrollsnelheid</translation>
     </message>
     <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Niets&gt;</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Open bestand</translation>
     </message>
     <message>
         <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Auto scrollen</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoriet</translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation type="unfinished"></translation>
+        <source>Annotate</source>
+        <translation>Bijschrift</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Volledig scherm</translation>
     </message>
     <message>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom in</source>
+        <translation>Zoom in</translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom out</source>
+        <translation>Zoom uit</translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation type="unfinished"></translation>
+        <source>Back</source>
+        <translation>Terug</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <source>Forward</source>
+        <translation>Vooruit</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
-        <translation type="unfinished"></translation>
+        <source>Home</source>
+        <translation>Thuis</translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation type="unfinished"></translation>
+        <source>Page up</source>
+        <translation>Pagina omhoog</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation type="unfinished"></translation>
+        <source>Page down</source>
+        <translation>Pagina omlaag</translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
+        <source>Line up</source>
+        <translation>Regel omhoog</translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation type="unfinished"></translation>
+        <source>Line down</source>
+        <translation>Regel omlaag</translation>
     </message>
     <message>
-        <source>Annotation</source>
-        <translation type="unfinished"></translation>
+        <source>Beginning</source>
+        <translation>Begin</translation>
     </message>
     <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
+        <source>End</source>
+        <translation>Einde</translation>
     </message>
     <message>
-        <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <source>Escape Button</source>
+        <translation>Escapeknop</translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
+        <source>Space Button</source>
+        <translation>Spatieknop</translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
+        <source>Return Button</source>
+        <translation>Return knop</translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <source>Left Arrow</source>
+        <translation>Pijl naar links</translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation type="unfinished"></translation>
+        <source>Right Arrow</source>
+        <translation>Pijl naar rechts</translation>
     </message>
     <message>
-        <source>Markup</source>
-        <translation type="unfinished"></translation>
+        <source>Down Arrow</source>
+        <translation>Pijl naar beneden</translation>
     </message>
     <message>
-        <source>Auto</source>
-        <translation type="unfinished"></translation>
+        <source>Up Arrow</source>
+        <translation>Pijl omhoog</translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
+        <source>Tidy-up</source>
+        <translation>Schoon op</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Delete Bookmarks</source>
+        <translation>Verwijder favorieten</translation>
     </message>
     <message>
-        <source>HTML</source>
-        <translation type="unfinished"></translation>
+        <source>Delete Configuration</source>
+        <translation>Verwijder instellingen</translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Peanut/PML</source>
-        <translation type="unfinished"></translation>
+        <source>Open</source>
+        <translation>Open</translation>
     </message>
     <message>
-        <source>Layout</source>
-        <translation type="unfinished"></translation>
+        <source>Close</source>
+        <translation>Sluit</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Twee/Een
+Aanraking</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Vind</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Bijschrift</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>Internationaal</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>Ideogrammen</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>Ideogrambreedte</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>Gebruik font
+in dialogen</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Codering</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Programma</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>Twee/Een
+Aanraking</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Woordenboek</translation>
     </message>
     <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Wissel aanraak
+actie</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder regeleinden</translation>
     </message>
     <message>
         <source>Dehyphen</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder hyphens</translation>
     </message>
     <message>
         <source>Single Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Enkele spatiëring</translation>
     </message>
     <message>
         <source>Unindent</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder inspringing</translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
-        <translation type="unfinished"></translation>
+        <source>Reparagraph</source>
+        <translation>Herparagrafeer</translation>
     </message>
     <message>
         <source>Double Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Dubbele spatiëring</translation>
     </message>
     <message>
-        <source>Indent+</source>
-        <translation type="unfinished"></translation>
+        <source>Remap</source>
+        <translation>Herplaats</translation>
     </message>
     <message>
-        <source>Indent-</source>
-        <translation type="unfinished"></translation>
+        <source>Embolden</source>
+        <translation>Maak vet</translation>
     </message>
     <message>
-        <source>Repalm</source>
-        <translation type="unfinished"></translation>
+        <source>Full Justify</source>
+        <translation>Volledig aanpassen</translation>
     </message>
     <message>
-        <source>Remap</source>
-        <translation type="unfinished"></translation>
+        <source>Text</source>
+        <translation>Tekst</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
+    <message>
+        <source>Indent</source>
+        <translation>Inspringing</translation>
     </message>
     <message>
-        <source>Embolden</source>
-        <translation type="unfinished"></translation>
+        <source>Page
+Overlap</source>
+        <translation>Pagina
+overlapping</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>Plaatjes
+zoomen</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>Marges</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>Paragraaf
+instelling</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>Regel
+instelling</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>Markering</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Letterype</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoriet</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Bijschrift</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>Ga naar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>Autogen</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Schoon</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Sla op</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>Schoon op</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>Markeer blok</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>Kopiëer blok</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>Zwevend</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>Enkele balk</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>Menu/werkbalk</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>Meerdere balken</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>Boven</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>Onder</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>Rechts</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>Links</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>Geminimaliseerd</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>Verplaatsbaar</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>Bijschrift</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Woordenboek</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Klembord</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>Depluck</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>Dejpluck</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>Doorgaand</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Selecteer aktie</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Plucker</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>Scroll</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Thuis</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Vooruit</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>Pagina omhoog</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>Pagina omlaag</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ga naar begin</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ga naar einde</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>Spring</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Pagina/Regel scroll</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>OpieLezer Instellingen</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>Layout</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>Layout(2)</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>Locale</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Diverse</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>Knoppen</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>Sla URL op</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>Klembord</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>Lokaal bestand</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>Globaal bestand</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Volledig scherm</translation>
     </message>
     <message>
         <source>Zoom In</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom in</translation>
     </message>
     <message>
         <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoom uit</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
-        <translation type="unfinished"></translation>
+        <source>Set Font</source>
+        <translation>Stel lettertype in</translation>
     </message>
     <message>
-        <source>Set width</source>
-        <translation type="unfinished"></translation>
+        <source>Encoding</source>
+        <translation>Codering</translation>
     </message>
     <message>
-        <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <source>Ideogram</source>
+        <translation>Ideogram</translation>
+    </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluit</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Volledig scherm</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation>Navigatie</translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Scroll</translation>
     </message>
     <message>
-        <source>Ascii</source>
-        <translation type="unfinished"></translation>
+        <source>Jump</source>
+        <translation>Spring</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>Pagina/Regel scrollen</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>Twee/Een Aanraking</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>Bijschrift</translation>
     </message>
     <message>
-        <source>UTF-8</source>
-        <translation type="unfinished"></translation>
+        <source>Up</source>
+        <translation>Omhoog</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
-        <translation type="unfinished"></translation>
+        <source>Down</source>
+        <translation>Omlaag</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
-        <translation type="unfinished"></translation>
+        <source>Find...</source>
+        <translation>Vind...</translation>
     </message>
     <message>
-        <source>Palm</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom In</source>
+        <translation>Zoom in</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
-        <translation type="unfinished"></translation>
+        <source>Zoom Out</source>
+        <translation>Zoom uit</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel lettertype in</translation>
     </message>
     <message>
         <source>Annotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijschrift</translation>
     </message>
     <message>
         <source>Goto</source>
-        <translation type="unfinished"></translation>
+        <translation>Ga naar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Autogen</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla op</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon op</translation>
     </message>
     <message>
         <source>Start Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Start blok</translation>
     </message>
     <message>
         <source>Copy Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiëer blok</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand</translation>
     </message>
     <message>
         <source>Marks</source>
-        <translation type="unfinished"></translation>
+        <translation>Markeringen</translation>
     </message>
     <message>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind volgende</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit vinden</translation>
     </message>
     <message>
         <source>Do Reg</source>
-        <translation type="unfinished"></translation>
+        <translation>Doe Reg</translation>
     </message>
     <message>
         <source>Close Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit bewerken</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Bekijk</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuratie</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>Sla config op</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>Laad config</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>Verwijder config</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>Werkbalken</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>Start script</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>Exporteer links</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>Ga naar begin</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>Ga naar einde</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Thuis</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Vooruit</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>Scrollen</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>Stel doel in</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>Pauze Paras</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>Stel codering in</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>Ideogram</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Favoriet</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Lezer</translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation type="unfinished"></translation>
+        <translation>Blader naar bestand</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
-        <translation type="unfinished"></translation>
+        <translation>Verborgen</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Naam</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Grootte</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index 82edfac..60b9ef8 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -1,105 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel PINcode in</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer PINcode in</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
+        <translation>PINcode niet correct</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingevoerde PINcode is niet correct.
+Toegang geweigerd</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Iedere</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer nieuwe PINcode in</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Voer nieuwe opnieuw PINcode in</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Beveiligingsinstellingen</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon PINcode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
+        <translation>Vraag PINcode bij power-aan</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
+        <translation>Accepteer sync van netwerk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.129.0/24 (standaard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
+        <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
+        <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished"></translation>
+        <translation>1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Iedere</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Geen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation>PINcode</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Log in</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Log automatich in</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/sheetqt.ts b/i18n/nl/sheetqt.ts
index 6a05307..9f1d802 100644
--- a/i18n/nl/sheetqt.ts
+++ b/i18n/nl/sheetqt.ts
@@ -1,787 +1,797 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Randen</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
+        <translation>Achter&amp;grond</translation>
     </message>
     <message>
         <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lettertype</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Uitlijning</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Breedte:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kleur:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>%Standaard randen</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Stijl:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Stan&amp;daard achtergrond</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lettertype:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Grootte:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vet</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cursief</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Standaard lettertype</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verticaal:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Horizontaal:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Regelafbreking</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Standaar&amp;d uitlijning</translation>
     </message>
     <message>
         <source>Format Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel cellen in</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Werkblad</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zoek &amp;&amp; Vervang</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opties</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zoek naar:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vervang door:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Type</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vind</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>V&amp;ervang</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>Vervang &amp;alle</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Lettergrootte overeenkomend</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
+        <translation>Allen huidige &amp;selectie</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
+        <translation>G&amp;ehele cel</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind &amp; Vervang</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Werkblad</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Inconsistentiefout!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand kan niet worden opgeslagen!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand kan niet worden geopend!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
+        <translation>Foutief bestandsformaat!</translation>
     </message>
     <message>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla bestand op</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wilt u het huidige bestand opslaan?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bestandsnaam:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>OnbenoemdBestand</translation>
     </message>
     <message>
         <source>New File</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuw bestand</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nieuw</translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Open bestand</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Open</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sla op</translation>
     </message>
     <message>
         <source>Save File As</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla op als</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
+        <translation>Sla op &amp;als</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Accepteer</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Accepteer</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Annuleer</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Annuleer</translation>
     </message>
     <message>
         <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Celselecteerder</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Cel&amp;selecteerder</translation>
     </message>
     <message>
         <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Knip cellen</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>Cu&amp;t</translation>
     </message>
     <message>
         <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiëer cellen</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopiëer</translation>
     </message>
     <message>
         <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Plak cellen</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Plak</translation>
     </message>
     <message>
         <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Plak inhoud</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
+        <translation>Plak &amp;inhoud</translation>
     </message>
     <message>
         <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon cellen</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
+        <translation>Schoon Ce&amp;llen</translation>
     </message>
     <message>
         <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg cellen in</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;ellen</translation>
     </message>
     <message>
         <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg rijen in</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rijen</translation>
     </message>
     <message>
         <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg kolommen in</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kolommen</translation>
     </message>
     <message>
         <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg werkbladen toe</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Werkbladen</translation>
     </message>
     <message>
         <source>Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Cellen</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cellen</translation>
     </message>
     <message>
         <source>Row Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Rijhoogte</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoogt&amp;e</translation>
     </message>
     <message>
         <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel rij bij</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Stel bij</translation>
     </message>
     <message>
         <source>Show Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Laat rij zien</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Laat zien</translation>
     </message>
     <message>
         <source>Hide Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Verberg rij</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verberg</translation>
     </message>
     <message>
         <source>Column Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolombreedte</translation>
     </message>
     <message>
         <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Breedte</translation>
     </message>
     <message>
         <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel kolom bij</translation>
     </message>
     <message>
         <source>Show Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Laat kolom zien</translation>
     </message>
     <message>
         <source>Hide Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Verberg kolom</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Hernoem werkblad</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hernoem</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwijder werkblad</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
+        <translation>V&amp;erwijder</translation>
     </message>
     <message>
         <source>Sort Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Sorteer data</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sort</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Vind &amp;&amp; Vervang</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vind &amp;&amp; Vervang</translation>
     </message>
     <message>
         <source>Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>Gelijk aan</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>G&amp;elijk aan</translation>
     </message>
     <message>
         <source>Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>Optelling</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Optelling</translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>Verminderen</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verminderen</translation>
     </message>
     <message>
         <source>Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>Vermenigvuldigen</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver&amp;menigvuldigen</translation>
     </message>
     <message>
         <source>Division</source>
-        <translation type="unfinished"></translation>
+        <translation>Delen</translation>
     </message>
     <message>
         <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Delen</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
+        <translation>Open HaakjesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Open haakjes</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluit haakjes</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sluit haakjes</translation>
     </message>
     <message>
         <source>Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>Komma</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Komma</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bestand</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wijzig</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Voeg &amp;in</translation>
     </message>
     <message>
         <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Formatteer</translation>
     </message>
     <message>
         <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Data</translation>
     </message>
     <message>
         <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rij</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolo&amp;m</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Werkblad</translation>
     </message>
     <message>
         <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Functie</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Standaard</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>Opsomming</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>Op&amp;somming</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Absolute waarde</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Absolute waarde</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinus</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
+        <translation>Si&amp;nus</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc sinus</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;rc sinus</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Cosinus</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cosinus</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc cosinus</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc cos&amp;inus</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Tangent</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tangent</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangent</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tan&amp;gent</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangent van coordinaten</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>C&amp;oor. Arc Tangent</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>Exponentieel</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Exponentieel</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Logaritmisch</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logaritmisch</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation type="unfinished"></translation>
+        <translation>Macht</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Macht</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mathematisch</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemiddeld</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gemiddeld</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximum</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma&amp;ximum</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Minimum</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Tel op</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tel op</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Statistisch</translation>
     </message>
     <message>
         <source>Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Functies</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Over Opie Werkblad</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Werkblad
+Spreadsheet Software voor Opie
+QWDC Beta Winnaar (als Sheet/Qt)
+
+Ontwikkeld door: Serdar Ozler
+Release 1.0.2
+Release Datum: October 08, 2002
+
+Dit product is gelicenseerd onder de GPL. Het is vrij distribueerbaar. Als je de laatste versie en/of de broncode wilt hebben, ga dan naar de deze website:
+
+http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aa&amp;ntal rijen:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aa&amp;ntal kolommen:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aa&amp;ntal werkbladen:</translation>
     </message>
     <message>
         <source>Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkblad</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hoogte van iedere rij:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Breedte van iedere kolom:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Werkbladnaam:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
+        <translation>Er is maar een werkblad!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Weet u het zeker?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Type</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaats cellen Om&amp;laag</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
+        <translation>Verplaats cellen naar &amp;rechts</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
+        <translation>Hele ri&amp;j</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
+        <translation>Hele &amp;kolom</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Grammaticafout!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Zoeksleutel niet gevonden!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sorteer</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opties</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sorteer op</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Daarnaa op</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
+        <translation>Daarnaa &amp;op</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Richting</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Boven naar beneden (rijen)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Links naar rechts (kolommen)</translation>
     </message>
     <message>
         <source>Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Sorteer</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Oplopend</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aflopend</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
+        <translation>Een cel kan niet worden gesorteerd!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/showimg.ts b/i18n/nl/showimg.ts
new file mode 100644
index 0000000..d2e2208
--- a/dev/null
+++ b/i18n/nl/showimg.ts
@@ -0,0 +1,158 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation>Helderheid</translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation>Titel</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Soort</translation>
+    </message>
+</context>
+<context>
+    <name>ImageViewer</name>
+    <message>
+        <source>Image Viewer</source>
+        <translation>Plaatjeskijker</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation>Duimnagelaanzicht</translation>
+    </message>
+    <message>
+        <source>Slide show</source>
+        <translation>Slideshow</translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation>Voorkeuren...</translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation>Plaatje info</translation>
+    </message>
+    <message>
+        <source>Horizontal flip</source>
+        <translation>Horizontaal omklappen</translation>
+    </message>
+    <message>
+        <source>Vertical flip</source>
+        <translation>Verticaal omklappen</translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation>Open ...</translation>
+    </message>
+    <message>
+        <source>Rotate 90</source>
+        <translation>Roteer 90</translation>
+    </message>
+    <message>
+        <source>Rotate 180</source>
+        <translation>Roteer 180</translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation>Roteer 270</translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation>Helderheid ...</translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation>Zwart/Wit</translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation>Schaal naar scherm</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Volledig scherm</translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation>Stop Slideshow</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Bestand</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Aanzicht</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source> - Image Viewer</source>
+        <translation>- Plaatjeskijker</translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation>%1 kleuren</translation>
+    </message>
+    <message>
+        <source> True color</source>
+        <translation>Ware kleuren</translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation>%1 alpha lagen</translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation>8-bits alpha kanaal</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation>Voorkeuren</translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation>Slideshow</translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation>Tijd tussen plaatjes</translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation>Herhaal slideshow</translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation>Omgekeerde volgorde</translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation>Laad plaatjes 90 graden gedraaid</translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation>Snelladen plaatjes</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/snake.ts b/i18n/nl/snake.ts
new file mode 100644
index 0000000..b71e549
--- a/dev/null
+++ b/i18n/nl/snake.ts
@@ -0,0 +1,51 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SnakeGame</name>
+    <message>
+        <source>Snake</source>
+        <translation>Snake</translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation>Nieuw Spel</translation>
+    </message>
+    <message>
+        <source>SNAKE!</source>
+        <translation>SNAKE!</translation>
+    </message>
+    <message>
+        <source>Use the arrow keys to guide the
+snake to eat the mouse. You must not
+crash into the walls, edges or its tail.</source>
+        <translation>Gebruik de richtingtoetsen om de
+slang de muizen te laten opeten. U moet
+de muren, randen en de staart ontwijken.</translation>
+    </message>
+    <message>
+        <source>Press Any Key To Start</source>
+        <translation type="obsolete">Druk een toets om te starten</translation>
+    </message>
+    <message>
+        <source>     Score :    %1   </source>
+        <translation>Score: %1</translation>
+    </message>
+    <message>
+        <source>GAME OVER!
+ Your Score: %1</source>
+        <translation>GAME OVER!
+Uw score: %1</translation>
+    </message>
+    <message>
+        <source>Press Any Key to Begin a New Game.</source>
+        <translation type="obsolete">Druk een toets om opnieuw te starten.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Druk een toets om te beginnen</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Druk een toets om een nieuw spel te beginnen.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/sound.ts b/i18n/nl/sound.ts
new file mode 100644
index 0000000..24a27e0
--- a/dev/null
+++ b/i18n/nl/sound.ts
@@ -0,0 +1,128 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SoundSettings</name>
+    <message>
+        <source>Shows icon</source>
+        <translation>Laat icoon zien</translation>
+    </message>
+    <message>
+        <source>Hides icon</source>
+        <translation>Verberg icoon</translation>
+    </message>
+</context>
+<context>
+    <name>SoundSettingsBase</name>
+    <message>
+        <source>Vmemo Settings</source>
+        <translation>Vmemo instellingen</translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation>Stereo</translation>
+    </message>
+    <message>
+        <source>16 bit</source>
+        <translation>16 bit</translation>
+    </message>
+    <message>
+        <source>Visual Alerts</source>
+        <translation>Visuele waarschuwingen</translation>
+    </message>
+    <message>
+        <source>Sample Rate:</source>
+        <translation>Sample Rate:</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>33075</source>
+        <translation>33075</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>Recording Directory:</source>
+        <translation>Opnamemap:</translation>
+    </message>
+    <message>
+        <source>Recording Key:</source>
+        <translation>Opname sleutel:</translation>
+    </message>
+    <message>
+        <source>Taskbar Icon</source>
+        <translation>Taakbalkicoon</translation>
+    </message>
+    <message>
+        <source>Key_Record</source>
+        <translation>Toets opname</translation>
+    </message>
+    <message>
+        <source>Key_Space</source>
+        <translation>Toets spatie</translation>
+    </message>
+    <message>
+        <source>Key_Home</source>
+        <translation>Toets Home</translation>
+    </message>
+    <message>
+        <source>Key_Calender</source>
+        <translation>Toets Kalender</translation>
+    </message>
+    <message>
+        <source>Key_Contacts</source>
+        <translation>Toets Kontakten</translation>
+    </message>
+    <message>
+        <source>Key_Menu</source>
+        <translation>Toets Menu</translation>
+    </message>
+    <message>
+        <source>Key_Mail</source>
+        <translation>Toets Mail</translation>
+    </message>
+    <message>
+        <source>Recording Limit in seconds:</source>
+        <translation>Opnamelimiet in seconden:</translation>
+    </message>
+    <message>
+        <source>30</source>
+        <translation>30</translation>
+    </message>
+    <message>
+        <source>20</source>
+        <translation>20</translation>
+    </message>
+    <message>
+        <source>15</source>
+        <translation>15</translation>
+    </message>
+    <message>
+        <source>10</source>
+        <translation>10</translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation>5</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Ongelimiteerd</translation>
+    </message>
+    <message>
+        <source>Restart Opie if needed</source>
+        <translation>Herstart Opie indien nodig</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/sshkeys.ts b/i18n/nl/sshkeys.ts
new file mode 100644
index 0000000..9c10673
--- a/dev/null
+++ b/i18n/nl/sshkeys.ts
@@ -0,0 +1,40 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SSHKeysApp</name>
+    <message>
+        <source>Error running ssh-add</source>
+        <translation>Fout bij uitvoeren ssh-add</translation>
+    </message>
+</context>
+<context>
+    <name>SSHKeysBase</name>
+    <message>
+        <source>SSH Keys</source>
+        <translation>SSH Sleutels</translation>
+    </message>
+    <message>
+        <source>Add Keys:</source>
+        <translation>Voeg sleutels toe:</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Ververs</translation>
+    </message>
+    <message>
+        <source>Clear Keys</source>
+        <translation>Schoon sleutels</translation>
+    </message>
+    <message>
+        <source>Key Name</source>
+        <translation>Sleutelnaam</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Vingerafdruk</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/stockticker.ts b/i18n/nl/stockticker.ts
new file mode 100644
index 0000000..5af63c6
--- a/dev/null
+++ b/i18n/nl/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Open bestand</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Sluit</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>&amp;Vooruit</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>&amp;Achteruit</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Thuis</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Voeg boekenlegger toe</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Bestand</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Ga</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Geschiedenis</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Boekenleggers</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Achteruit</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Vooruit</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Thuis</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Sijmboolzoeken</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Voer iets in om te zoeken.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
new file mode 100644
index 0000000..7566e15
--- a/dev/null
+++ b/i18n/nl/sysinfo.ts
@@ -0,0 +1,298 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Compact Flash kaart.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Harde schijf.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op deze Secure Digital kaart.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Deze grafiek geeft weer hoeveel ruimte van het interne Flash geheugen van dit apparaat gebruikt wordt.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op de tijdelijke RAM schijf van dit apparaat.</translation>
+    </message>
+</context>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation>Programma GPU gebruik (%)</translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation>Systeem CPU gebruik (%)</translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation>Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation>Type:</translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation>Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw hanheld.
+Gehugen wordt als volgt onderverdeeld:
+
+1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
+2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
+3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
+4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation>Gebruikt (%1 kB)</translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation>Buffers (%1 kB)</translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation>Cache (%1 kB)</translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation>Vrij (%1 kB)</translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation>Totaal geheugen: %1 kB</translation>
+    </message>
+</context>
+<context>
+    <name>ModulesInfo</name>
+    <message>
+        <source>Module</source>
+        <translation>Module</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Grootte</translation>
+    </message>
+    <message>
+        <source>Use#</source>
+        <translation>Gebruik#</translation>
+    </message>
+    <message>
+        <source>Used By</source>
+        <translation type="obsolete">Gebruikt door</translation>
+    </message>
+    <message>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <translation>Dit is een lijst van alle kernelmodules die momenteel geladen zijn op deze handheld.
+
+Druk een tijd op een module om meer informatie over de module te zien, of hem te beeindigen.</translation>
+    </message>
+    <message>
+        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
+        <translation>Selecteer hier een commando en klik op de Zend knop (rechts in beeld) om het commando naar de module te sturen.</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Zend</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected command to the module selected above.</source>
+        <translation>Klik hier om het commando naar de module te sturen.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this module.</source>
+        <translation>Dit vlak geeft gedetailleerde informatie over deze module weer.</translation>
+    </message>
+    <message>
+        <source>You really want to execute
+</source>
+        <translation type="obsolete">Wilt u dit echt uitvoeren
+</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation>Gebruikt door</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation>Wilt u %1 echt gebruiken op dit onderdeel?</translation>
+    </message>
+</context>
+<context>
+    <name>MountInfo</name>
+    <message>
+        <source> : %1 kB</source>
+        <translation>: %1 kB</translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation>Gebruikt (%1 kB)</translation>
+    </message>
+    <message>
+        <source>Available (%1 kB)</source>
+        <translation>Beschikbaar (%1 kB)</translation>
+    </message>
+</context>
+<context>
+    <name>ProcessInfo</name>
+    <message>
+        <source>PID</source>
+        <translation>PID</translation>
+    </message>
+    <message>
+        <source>Command</source>
+        <translation>Commando</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <translation>Dit is een lijst van alle processen die momenteel geladen zijn op deze handheld.
+
+Druk een tijd op een module om meer informatie over de module te zien, of een signaal te sturen.</translation>
+    </message>
+    <message>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <translation>Selecteer hier een signaal en klik op de Zend knop (rechts in beeld) om hetnaar dit proces te sturen.</translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation>Zend</translation>
+    </message>
+    <message>
+        <source>Click here to send the selected signal to this process.</source>
+        <translation>Klik hier om het signaal naar dit proces te sturen.</translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this process.</source>
+        <translation>Dit vlak laat gedetailleerde info over dit proces zien.</translation>
+    </message>
+    <message>
+        <source>You really want to send
+</source>
+        <translation type="obsolete">Wilt u dit echt zenden
+</translation>
+    </message>
+    <message>
+        <source>You really want to send %1 to this process?</source>
+        <translation>Wilt u %1 echt naar dit onderdeel sturen?</translation>
+    </message>
+</context>
+<context>
+    <name>SystemInfo</name>
+    <message>
+        <source>System Info</source>
+        <translation>Systeeminfo</translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation>Geheugen</translation>
+    </message>
+    <message>
+        <source>Storage</source>
+        <translation>Opslag</translation>
+    </message>
+    <message>
+        <source>CPU</source>
+        <translation>CPU</translation>
+    </message>
+    <message>
+        <source>Process</source>
+        <translation>Proces</translation>
+    </message>
+    <message>
+        <source>Modules</source>
+        <translation>Modules</translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation>Versie</translation>
+    </message>
+</context>
+<context>
+    <name>VersionInfo</name>
+    <message>
+        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Versie: </translation>
+    </message>
+    <message>
+        <source>Compiled by: </source>
+        <translation>Gecompileerd door:</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versie: </translation>
+    </message>
+    <message>
+        <source>Built on: </source>
+        <translation>Gebouwd op:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Version: </source>
+        <translation>&lt;p&gt;Versie:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Model: </source>
+        <translation>&lt;p&gt;Model:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Vendor: </source>
+        <translation>&lt;p&gt;Fabrikant:</translation>
+    </message>
+    <message>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <translation>Deze pagina geeft de huidige versies van Opie, de Linux kernel en de distributie van deze handheld weer.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/systemtime.ts b/i18n/nl/systemtime.ts
index c68c7e9..25b536c 100644
--- a/i18n/nl/systemtime.ts
+++ b/i18n/nl/systemtime.ts
@@ -1,250 +1,260 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijdsformaat</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>uu:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>D/M uu:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>M/D uu:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished"></translation>
+        <translation>12/24 uur</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished"></translation>
+        <translation>24 uur</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished"></translation>
+        <translation>12 uur</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished"></translation>
+        <translation>Datumformaat</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
+        <translation>Week start op</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished"></translation>
+        <translation>Zondag</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished"></translation>
+        <translation>Maandag</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Systeemtijd</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijd</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formaat</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Instellingen</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
+        <translation>Voorspel</translation>
     </message>
     <message>
         <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">U vroeg om een vertraging van</translation>
     </message>
     <message>
         <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">minuten, maar slechts</translation>
     </message>
     <message>
         <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">minuten zijn verstreken sinds laatste controle.&lt;br&gt;Doorgaan?</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Doorgaan?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>Voer uit:
+ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout tijdens ophalen tijd van netwerk.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <translation>Fout tijdens uitvoer van ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijdsserver</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fout tijdens ophalen tijd van
+server:</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">seconden</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <translation>Kan niet met server verbinden</translation>
+    </message>
+    <message>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>U vroeg om een vertraging van %1 minuten, maar slechts %2 minuten zijn verstreken sinds de laatste controle. &lt;br&gt; Doorgaan?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 seconden</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Starttijd</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/b</translation>
     </message>
     <message>
         <source>Time shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijdsverschil</translation>
     </message>
     <message>
         <source>New time</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieuwe tijd</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Haal tijd van het netwerk</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Voorspelde tijdsverschuiving</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/b</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Geachatte verschuiving</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Voorspelde tijd</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschuiving [s/u]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Laatste [u]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
+        <translation>Offset [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished"></translation>
+        <translation>Voorspelde tijd</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel voorspelde tijd in</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <translation>s/u</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>seconden</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijsserver</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuten tussen tijdverversing</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuten tussen voorspellingsverversing</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Geef tijdsserver informatie weer</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Geef tijdsvoorspellingsinformatie weer</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished"></translation>
+        <translation>Uur</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuut</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Tijdszone</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Haal tijd van het netwerk</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Stel voorspelde tijd in</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/tableviewer.ts b/i18n/nl/tableviewer.ts
new file mode 100644
index 0000000..5e8a089
--- a/dev/null
+++ b/i18n/nl/tableviewer.ts
@@ -0,0 +1,69 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
+        <translation>KeyList::addKey() Kan standaardwaarde niet instellen bij type %1, Key niet toegevoegd.</translation>
+    </message>
+    <message>
+        <source>DataElem::setField(%1, %2) No valid type found</source>
+        <translation>DataElem::setField(%1, %2) Geen juist type gevonden</translation>
+    </message>
+</context>
+<context>
+    <name>TVBrowseKeyEntry</name>
+    <message>
+        <source>Reset</source>
+        <translation>Reset</translation>
+    </message>
+    <message>
+        <source>key</source>
+        <translation>sleutel</translation>
+    </message>
+</context>
+<context>
+    <name>TVKeyEdit_gen</name>
+    <message>
+        <source>TableViewer - Edit Keys</source>
+        <translation>TabelViewer - Wijzig sleutels</translation>
+    </message>
+    <message>
+        <source>Key Name</source>
+        <translation>Sleutelnaam</translation>
+    </message>
+    <message>
+        <source>Key Type</source>
+        <translation>Sleuteltype</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Clear All</source>
+        <translation>Schoon alles</translation>
+    </message>
+</context>
+<context>
+    <name>TVListView</name>
+    <message>
+        <source>List View</source>
+        <translation>Lijstaanzicht</translation>
+    </message>
+</context>
+<context>
+    <name>TableViewerWindow</name>
+    <message>
+        <source>Table Viewer</source>
+        <translation>TabelViewer</translation>
+    </message>
+    <message>
+        <source>could not load Document</source>
+        <translation>kan document niet laden</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/tabmanager.ts b/i18n/nl/tabmanager.ts
new file mode 100644
index 0000000..6eeb1d4
--- a/dev/null
+++ b/i18n/nl/tabmanager.ts
@@ -0,0 +1,88 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AppEdit</name>
+    <message>
+        <source>Application</source>
+        <translation>Programma</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Naam:</translation>
+    </message>
+    <message>
+        <source>Icon:</source>
+        <translation>Icoon:</translation>
+    </message>
+    <message>
+        <source>Exec:</source>
+        <translation>Exec:</translation>
+    </message>
+    <message>
+        <source>Comment:</source>
+        <translation>Commentaar:</translation>
+    </message>
+</context>
+<context>
+    <name>TabManager</name>
+    <message>
+        <source>Message</source>
+        <translation>Bericht</translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove with applications
+still in the group.</source>
+        <translation>Kan niet verwijderen terwijl er nog
+programma&apos;s in de groep zijn.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete?</source>
+        <translation>Weet je zeker dat je wilt verwijderen?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleer</translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove.</source>
+        <translation>Kan niet verwijderen.</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation>Verzamelen iconen...</translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation>Tab</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>Programma</translation>
+    </message>
+</context>
+<context>
+    <name>TabManagerBase</name>
+    <message>
+        <source>Tab Manager</source>
+        <translation>Tabblad manager</translation>
+    </message>
+    <message>
+        <source>Hierarchy</source>
+        <translation>Hierarchie</translation>
+    </message>
+</context>
+<context>
+    <name>Wait</name>
+    <message>
+        <source>Please Wait...</source>
+        <translation>Wachten aub...</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/tetrix.ts b/i18n/nl/tetrix.ts
new file mode 100644
index 0000000..9d96667
--- a/dev/null
+++ b/i18n/nl/tetrix.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>leeg</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Voer uw naam in!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Hoogste scores</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Punten</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ronde</translation>
+    </message>
+</context>
+<context>
+    <name>QTetrix</name>
+    <message>
+        <source>Tetrix</source>
+        <translation>Tetrix</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Volgende</translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation>Score</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Ronde</translation>
+    </message>
+    <message>
+        <source>Removed</source>
+        <translation>Verwijderd</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation>Start</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/textedit.ts b/i18n/nl/textedit.ts
new file mode 100644
index 0000000..1011528
--- a/dev/null
+++ b/i18n/nl/textedit.ts
@@ -0,0 +1,280 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TextEdit</name>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Opslaan</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Opslaan als</translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation>Knip</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Kopieer</translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation>Plak</translation>
+    </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation>Voeg datum en tijd in</translation>
+    </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation>Ga naar regel...</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>Vind...</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Zoom in</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Zoom uit</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>Lettertype</translation>
+    </message>
+    <message>
+        <source>Advanced Features</source>
+        <translation>Geavanceerde mogelijkheden</translation>
+    </message>
+    <message>
+        <source>Wrap lines</source>
+        <translation>Regelafbreking</translation>
+    </message>
+    <message>
+        <source>Start with new file</source>
+        <translation>Begin met nieuw bestand</translation>
+    </message>
+    <message>
+        <source>Prompt on Exit</source>
+        <translation>Vraag bij weggaan</translation>
+    </message>
+    <message>
+        <source>Always open linked file</source>
+        <translation>Altijd gekoppeld bestand openen</translation>
+    </message>
+    <message>
+        <source>File Permissions</source>
+        <translation>Bestandsrechten</translation>
+    </message>
+    <message>
+        <source>Search Bar Open</source>
+        <translation>Zoekregel openen</translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation>Automatisch opslaan 5 min.</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Bestand</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Wijzig</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Bekijk</translation>
+    </message>
+    <message>
+        <source>Find Next</source>
+        <translation>Vind volgende</translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation>Sluit Vind</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation>Tekst</translation>
+    </message>
+    <message>
+        <source>Text Editor</source>
+        <translation>Teksteditor</translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation>Teksteditor ontdekte dat&lt;br&gt; u een &lt;b&gt;.desktop&lt;/b&gt; selecteert.&lt;br&gt;Zal ik het &lt;b&gt;.desktop&lt;/b&gt; of &lt;b&gt;gekoppeld&lt;/b&gt; bestand openen? </translation>
+    </message>
+    <message>
+        <source>.desktop File</source>
+        <translation>.desktop Bestand</translation>
+    </message>
+    <message>
+        <source>Linked Document</source>
+        <translation>Gekoppeld document</translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation>Tekst wijzigen</translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation>Schrijven mislukt</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation>Onbenoemd</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation>Rechten</translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation>Kies lettertype</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
+        <translation type="obsolete">Wil je het huidige&lt;BR&gt;bestand echt&lt;B&gt;verwijderen&lt;/B&gt;van de schijf?
+&lt;BR&gt;Dit is &lt;B&gt;onomkeerbaar!!&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation>Tekst Editor is een copyright van &lt;BR&gt;2000 Trolltech AS, en&lt;BR&gt;2002 door &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;en is gelicenseerd onder de GPL</translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation>Tekst wijzigen</translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation>Teksteditor ontdekte
+dat het bestand niet opgeslagen
+wijzigingen bevat.
+Doorgaan met opslaan?
+</translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation>Sla niet op</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuleer</translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation>Niet genoeg regels</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Tekstverwerker</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Moet dit bestand echt&lt;br&gt;
+van de schijf&lt;b&gt;verwijderd&lt;/b&gt;
+worden? Dit is onomkeerbaar!</translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>File Permissions</source>
+        <translation>Bestandsrechten</translation>
+    </message>
+    <message>
+        <source>Set File Permissions</source>
+        <translation>Stel bestandsrechten in</translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation>Stel bestandsrechten in voor:</translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation>eigenaar</translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation>groep</translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation>anderen</translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation>Eigenaar</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Groep</translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation>lees</translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation>schrijf</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>uitvoeren</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Waarschuwing</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Fout- geen gebruiker</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Fout- geen groep</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Fout bij instellen eigenaar of groep</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Fout bij instellen modus</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/tictac.ts b/i18n/nl/tictac.ts
new file mode 100644
index 0000000..b80c416
--- a/dev/null
+++ b/i18n/nl/tictac.ts
@@ -0,0 +1,48 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>Boter, Kaas en Eieren</translation>
+    </message>
+</context>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation>Computer begint</translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation>Mens begint</translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation>Spelen!</translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation>Stop</translation>
+    </message>
+    <message>
+        <source>Click Play to start</source>
+        <translation>Klik Spelen! om te starten</translation>
+    </message>
+    <message>
+        <source>Make your move</source>
+        <translation>Doe een zet</translation>
+    </message>
+    <message>
+        <source>You won!</source>
+        <translation>Jij wint!</translation>
+    </message>
+    <message>
+        <source>Computer won!</source>
+        <translation>Computer wint!</translation>
+    </message>
+    <message>
+        <source>It&apos;s a draw</source>
+        <translation>Gelijkspel</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/tinykate.ts b/i18n/nl/tinykate.ts
new file mode 100644
index 0000000..96acf9d
--- a/dev/null
+++ b/i18n/nl/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKate</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Opslaan</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Opslaan als</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluit</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Bestand</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Lettertype+</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Lettertype-</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Aanzicht</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Utils</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Kleurcodes</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Onbenoemd %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
new file mode 100644
index 0000000..5212380
--- a/dev/null
+++ b/i18n/nl/today.ts
@@ -0,0 +1,190 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Today</name>
+    <message>
+        <source>Today</source>
+        <translation>Vandaag</translation>
+    </message>
+    <message>
+        <source>Owned by </source>
+        <translation>Bezit van</translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation>Visitekaartje invullen a.u.b.</translation>
+    </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation>Klik hier om het bijbehorende programma te starten</translation>
+    </message>
+    <message>
+        <source>No plugins found</source>
+        <translation>Geen plugins gevonden</translation>
+    </message>
+    <message>
+        <source>No plugins activated</source>
+        <translation>Geen plugins geactiveerd</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Eigenaar: %1&lt;/b&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>TodayBase</name>
+    <message>
+        <source>Today</source>
+        <translation>Vandaag</translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation>Vandaag door Maximilian Reiß</translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
+        <translation>Klik hier voor het instellingsvenster</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfig</name>
+    <message>
+        <source>Today Config</source>
+        <translation>Vandaag instelling</translation>
+    </message>
+    <message>
+        <source>Load which plugins in what order:</source>
+        <translation>Laad plugins in welke volgorde:</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <translation>Vink een checkbox aan om een plugin te activeren/deactiveren of gebruik de pijltjes om de volgorde te veranderen</translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation>Schuif omhoog</translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation>Schuif omlaag</translation>
+    </message>
+    <message>
+        <source>active/order</source>
+        <translation>aktief/volgorde</translation>
+    </message>
+    <message>
+        <source>autostart on 
+resume?
+ (Opie only)</source>
+        <translation type="obsolete">autostart bij
+opstarten?
+(alleen Opie)</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="obsolete">vink dit aan als Vandaag moet starten vanuit slaapstand.</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Kleine bovenbalk</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="obsolete">minuten inactief</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="obsolete">Hoeveel minuten moet de PDA uitstaan voor Vandaag automatisch opkomt bij herstart</translation>
+    </message>
+    <message>
+        <source>Icon size</source>
+        <translation type="obsolete">Icoongrootte</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="obsolete">Stel icoongrootte in pixel in</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="obsolete">Ververs</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="obsolete">Hoevaak moet Vandaag zich verversen</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="obsolete">sec</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="obsolete">nooit</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>Div</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>Formulier1</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>vink dit aan als Vandaag moet starten vanuit slaapstand.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>start na slaapstand?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>mini banner</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Gebruik kleine banner</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Hoeveel minuten moet de PDA uitstaan voor Vandaag automatisch opkomt bij herstart</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>minuten inactief</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>pixels</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Stel icoongrootte in pixels in</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>icoongrootte</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>secsec</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>nooit</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Hoevaak moet Vandaag zich verversen</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>ververs</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/todolist.ts b/i18n/nl/todolist.ts
new file mode 100644
index 0000000..67ac649
--- a/dev/null
+++ b/i18n/nl/todolist.ts
@@ -0,0 +1,625 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="obsolete">&lt;h1&gt;Alarm om %0&lt;/h1&gt;&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Alarm om %1&lt;/h1&gt;&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Information</source>
+        <translation>Informatie</translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation>Alarms</translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation>Terugkeringen</translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Taakeditor</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation>Voer taak in</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Wijzig taak</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation>stil</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>luid</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Opie TeDoen lijst</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation>Nieuw van voorbeeld</translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation>Nieuwe taak</translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation>Klik hier om een nieuwe taak te maken.</translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation>Wijzig taak</translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation>Klik hier om de huidige taak te wijzigen.</translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation>Bekijk taak</translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation>Verwijder...</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation>Klik hier om de huidige taak te verwijderen.</translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation>Verwijder alle...</translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation>Verwijder gedaan</translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation>Dupliceer</translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation>IrDa Versturen</translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation>Klik hier om de huidige taak naar een ander apparaat te sturen.</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>Vind</translation>
+    </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation>Laat gedane taken zien</translation>
+    </message>
+    <message>
+        <source>Show only over-due tasks</source>
+        <translation>Laat alleen taken over tijd zien</translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation>Laat taak-eindtijden zien</translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation>Laat snelle taakbalk zien</translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation>Kategorie</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opties</translation>
+    </message>
+    <message>
+        <source>QuickEdit</source>
+        <translation>SnelWijziging</translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation>Dit is een lijst van alle huidige taken.
+
+De lijst geeft de volgende info door:
+1. Gedaan - Een groen vinkje geeft aan dat de taak is afgemaakt. Klik hier om een taak af te maken.
+2. Prioriteit - Een grafische weergave vaan de taakprioriteit. Dubbelklik om te wijzigen.
+3. Omschrijving - Omschrijving van de taak. Klik hier om de taak te selecteren.
+4. Streefdatum - Laat streefdatum voor taak zien. Deze kolom kan worden verborgen/weergegeven door Opties-&gt;&apos;Laat taak streefdata zien&apos; uit het menu hierboven te kiezen.</translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation>Alle kategorieen</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation>Onbenoemd</translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation>Plaatsgebrek</translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation>Todo kon uw wijzigingen
+niet opslaan.
+Maak plaats en probeer
+het nog eens.
+
+Toch stoppen?</translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation>Te Doen</translation>
+    </message>
+    <message>
+        <source>Can not edit data, currently syncing</source>
+        <translation type="obsolete">Kan data niet wijzigen tijdens synchronisatie</translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation>alle taken?</translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation>alle gedane taken?</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation>&lt;p&gt;%1 nieuwe taken aangekomen.&lt;p&gt;Wilt u ze aan de todolijst toevoegen?</translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation>Nieuwe taken</translation>
+    </message>
+    <message>
+        <source>C.</source>
+        <translation>C.</translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation>Prioriteit</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation>Omschrijving</translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation>Einddatum</translation>
+    </message>
+    <message>
+        <source>Configure Templates</source>
+        <translation>Stel voorbeelden in</translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Voorbeeld editor</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Voeg toe</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Wijzig</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Nieuw voorbeeld %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Voer de prioriteit van de nieuwe taak hier in.
+
+Dit vlak wordt de sneltaakbalk genoemd.
+
+Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Voer de omschrijving van de nieuwe taak hier in.
+
+Dit vlak wordt de sneltaakbalk genoemd.
+
+Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Meer</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Voer de extra info van de nieuwe taak hier in.
+
+Dit vlak wordt de sneltaakbalk genoemd.
+
+Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Voer in</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik hier om een nieuwe taak toe te voegen.
+
+Dit vlak wordt de sneltaakbalk genoemd.
+
+Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleer</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Klik hier om nieuwe taakinfo te schonen.
+
+Dit vlak wordt de sneltaakbalk genoemd.
+
+Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>Prioriteit:</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>Table View</source>
+        <translation>Tabelaanzicht</translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
+        <translation>%1 Dag(en)</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Geen</translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Date</source>
+        <translation>Datum</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Tijd</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Soort</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nieuw</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Wijzig</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Description:</source>
+        <translation>Omschrijving:</translation>
+    </message>
+    <message>
+        <source>Enter brief description of the task here.</source>
+        <translation>Voer hier een korte omschrijving van de taak in.</translation>
+    </message>
+    <message>
+        <source>Complete </source>
+        <translation>Gedaan</translation>
+    </message>
+    <message>
+        <source>Work on </source>
+        <translation>Werk aan</translation>
+    </message>
+    <message>
+        <source>Buy </source>
+        <translation>Koop</translation>
+    </message>
+    <message>
+        <source>Organize </source>
+        <translation>Organiseer</translation>
+    </message>
+    <message>
+        <source>Get </source>
+        <translation>Haal</translation>
+    </message>
+    <message>
+        <source>Update </source>
+        <translation>Updaten</translation>
+    </message>
+    <message>
+        <source>Create </source>
+        <translation>Maak</translation>
+    </message>
+    <message>
+        <source>Plan </source>
+        <translation>Plannen</translation>
+    </message>
+    <message>
+        <source>Call </source>
+        <translation>Bellen</translation>
+    </message>
+    <message>
+        <source>Mail </source>
+        <translation>Schrijven</translation>
+    </message>
+    <message>
+        <source>Select priority of task here.</source>
+        <translation>Stel prioriteit hier in.</translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation>Heel hoog</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Hoog</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normaal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Laag</translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation>Heel laag</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
+    </message>
+    <message>
+        <source>Select category to organize this task with.</source>
+        <translation>Selekteer kategorie waar deze taak inhoort.</translation>
+    </message>
+    <message>
+        <source>Recurring task</source>
+        <translation>Terugkerende taak</translation>
+    </message>
+    <message>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation>Klik hier als deze taak vaker voorkomt. Indien geselecteerd, kan frequentie ingesteld worden op de terugkerings tab.</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="obsolete">Notities:</translation>
+    </message>
+    <message>
+        <source>Enter any additional information about this task here.</source>
+        <translation>Voer hier extra info over deze taak in.</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Te Doen Lijst</translation>
+    </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Overzicht:</translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorStatus</name>
+    <message>
+        <source>Status:</source>
+        <translation>Status:</translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
+        <translation>Klik hier om de huidige status van deze taak in te stellen.</translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation>Gestart</translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation>Uitgesteld</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Gedaan</translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation>Niet gestart</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>Voortgang:</translation>
+    </message>
+    <message>
+        <source>Select progress made on this task here.</source>
+        <translation>Selecteer hier de gemaakte voortgang.</translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation>0%</translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation>20%</translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation>40%</translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation>6-%</translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation>80%</translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation>100%</translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation>Aanvangsdatum:</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was started.</source>
+        <translation>Klik hier om de startdatum van de taak in te stellen.</translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation>Einddatum:</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation>Klik hier om een eindtijd voor deze taak in te stellen.
+</translation>
+    </message>
+    <message>
+        <source>Completed:</source>
+        <translation>Afgemaakt:</translation>
+    </message>
+    <message>
+        <source>Click here to mark this task as completed.</source>
+        <translation>Klik hier om  deze taak als gedaan te markeren.</translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was completed.</source>
+        <translation>Klik hier om de tijd van ahandeling in te stellen.</translation>
+    </message>
+    <message>
+        <source>Maintainer Mode:</source>
+        <translation>Beheermodus:</translation>
+    </message>
+    <message>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation>Klik hier om de rol van de beheerder in te stellen.</translation>
+    </message>
+    <message>
+        <source>Nothing</source>
+        <translation>Niets</translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation>Verantwoordelijk</translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation>Gedaan door</translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation>Coordinatie</translation>
+    </message>
+    <message>
+        <source>Maintainer:</source>
+        <translation>Beheerder:</translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation>Dit is de naam van de huidige beheerder van deze taak.</translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation>test</translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation>Klik hier om de taakbeheerder te selecteren.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/ubrowser.ts b/i18n/nl/ubrowser.ts
new file mode 100644
index 0000000..b677f3f
--- a/dev/null
+++ b/i18n/nl/ubrowser.ts
@@ -0,0 +1,48 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>- uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - Webbrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>Fout!</translation>
+    </message>
+    <message>
+        <source>couldnt find ip address</source>
+        <translation type="obsolete">kan IP adres niet vinden</translation>
+    </message>
+    <message>
+        <source>couldnt create socket</source>
+        <translation type="obsolete">kan socket niet aanmaken</translation>
+    </message>
+    <message>
+        <source>couldnt connect to socket</source>
+        <translation type="obsolete">kan niet verbinden met socket</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>IP Adres niet gevonden</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Fout bij aanmaken socket</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Fout bij verbinden met socket</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/usermanager.ts b/i18n/nl/usermanager.ts
new file mode 100644
index 0000000..fde84a1
--- a/dev/null
+++ b/i18n/nl/usermanager.ts
@@ -0,0 +1,35 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GroupDialog</name>
+    <message>
+        <source>Add Group</source>
+        <translation>Groep toevoegen</translation>
+    </message>
+    <message>
+        <source>Edit Group</source>
+        <translation>Groep wijzigen</translation>
+    </message>
+</context>
+<context>
+    <name>UserConfig</name>
+    <message>
+        <source>OPIE User Manager</source>
+        <translation type="obsolete">OPIE Gebruikersmanager</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Opie Gebruikersmanager</translation>
+    </message>
+</context>
+<context>
+    <name>UserDialog</name>
+    <message>
+        <source>Add User</source>
+        <translation>Gebruiker toevoegen</translation>
+    </message>
+    <message>
+        <source>Edit User</source>
+        <translation>Gebruiker wijzigen</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/wellenreiter.ts b/i18n/nl/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/nl/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/nl/wordgame.ts b/i18n/nl/wordgame.ts
new file mode 100644
index 0000000..a61060c
--- a/dev/null
+++ b/i18n/nl/wordgame.ts
@@ -0,0 +1,133 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Board</name>
+    <message>
+        <source>Blanks: </source>
+        <translation>Blanco:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleer</translation>
+    </message>
+    <message>
+        <source>Unknown word</source>
+        <translation>Onbekend woord</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
+        <translation>&lt;p&gt;Het woord &quot;%1&quot; staat niet in het woordenboek.</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Voeg toe</translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation>Negeer</translation>
+    </message>
+</context>
+<context>
+    <name>NewGameBase</name>
+    <message>
+        <source>Players</source>
+        <translation>Spelers</translation>
+    </message>
+    <message>
+        <source>AI3: Smart AI player</source>
+        <translation>AI3: Slimme AI speler</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regels</translation>
+    </message>
+    <message>
+        <source>&amp;Start</source>
+        <translation>&amp;Start</translation>
+    </message>
+</context>
+<context>
+    <name>RulesBase</name>
+    <message>
+        <source>Game Rules</source>
+        <translation>Spelregels</translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation>Naam:</translation>
+    </message>
+    <message>
+        <source>Board</source>
+        <translation>Bord</translation>
+    </message>
+    <message>
+        <source>Size:</source>
+        <translation>Grootte:</translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation>Wijzig...</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Verwijder</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Annuleer</translation>
+    </message>
+</context>
+<context>
+    <name>ScoreInfo</name>
+    <message>
+        <source>&lt;P&gt;Invalid move</source>
+        <translation>&lt;p&gt;Foute zet</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Score: </source>
+        <translation>&lt;p&gt;Score:</translation>
+    </message>
+</context>
+<context>
+    <name>WordGame</name>
+    <message>
+        <source>Word Game</source>
+        <translation>Woordspel</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Klaar</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluit</translation>
+    </message>
+    <message>
+        <source>End game</source>
+        <translation>Einde spel</translation>
+    </message>
+    <message>
+        <source>Do you want to end the game early?</source>
+        <translation>Wil je tijdens het spel stoppen?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Nee</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/.directory b/i18n/no/.directory
index 5414269..4341d04 100644
--- a/i18n/no/.directory
+++ b/i18n/no/.directory
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Name=Norwegian
 Name[da]=Norsk
 Name[de]=Norwegisch
 Name[es]=Noruego
 Name[hu]=Norvég
-Name[it]=Norveščina
+Name[it]=Norvegese
 Name[ja]=ノルウェー語
 Name[no]=Norsk
 Name[pt]=Norueguês
 Name[pt_BR]=Norueguês
+Name[nl]=Noors
\ No newline at end of file
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index 72504bf..f67677b 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -1,1116 +1,1115 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Moveable</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afghanistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antarctica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 200ed6f..9a692b9 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -1,304 +1,355 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Merk</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Den katalogen eksisterer ikke</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
+        <translation>Advanced FileManager
+er opphavsrettslig beskyttet 2002-2003
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+og er GPL lisensiert</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Bytt katalog</translation>
     </message>
     <message>
         <source>Execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Utfør</translation>
     </message>
     <message>
         <source>Open as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Åpne som tekst</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Handlinger</translation>
     </message>
     <message>
         <source>Make Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Lag katalog</translation>
     </message>
     <message>
         <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
+        <translation>Lag symlenke</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Endre navn</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier</translation>
     </message>
     <message>
         <source>Copy As</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier som</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopier samme katalog</translation>
     </message>
     <message>
         <source>Move</source>
-        <translation type="unfinished"></translation>
+        <translation>Flytt</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Legg til Dokumenter</translation>
     </message>
     <message>
         <source>Run Command</source>
-        <translation type="unfinished"></translation>
+        <translation>Utfør kommando</translation>
     </message>
     <message>
         <source>File Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil info</translation>
     </message>
     <message>
         <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett rettigheter</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Rettigheter</translation>
     </message>
     <message>
         <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation type="unfinished"></translation>
+        <translation>Beam fil</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
+        <translation>AvansertFm</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Fil</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Utfør kommando med utskrift</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Velg alle</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Bytt til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Bytt til ekstern</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Bokmerke katalog</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern denne katalogen fra bokmerker</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Størrelse</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sikker på at du vil slette
+filene %1 ?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
+        <translation>Slette katalog?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sikker på at du vil kopiere
+filene %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
-        <translation type="unfinished"></translation>
+        <translation>Filen eksisterer!</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke kopiere %1 til %2</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksisterer. Ok for å overskrive?</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke kopiere</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation type="unfinished"></translation>
+        <translation>til</translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kopier</translation>
     </message>
     <message>
         <source> As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Som</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksisterer allerede.
+Er du sikker på at du vil slette?</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Kunne ikke flyttes
+</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
+        <translation>AvansertFm utskrift</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
+        <translation>AvansertFm Beam ut</translation>
     </message>
     <message>
         <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir sent.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Feil</translation>
     </message>
     <message>
         <source>Could not rename</source>
+        <translation>Kunne ikke endre filnavn</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Utskrift</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
+        <translation>Lagre utskrift til fil (bare navn)</translation>
+    </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett fil rettigheter</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett fil rettighter for:</translation>
     </message>
     <message>
         <source>owner</source>
-        <translation type="unfinished"></translation>
+        <translation>eier</translation>
     </message>
     <message>
         <source>group</source>
-        <translation type="unfinished"></translation>
+        <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
-        <translation type="unfinished"></translation>
+        <translation>andre</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Eier</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Gruppe</translation>
     </message>
     <message>
         <source>read</source>
-        <translation type="unfinished"></translation>
+        <translation>lese</translation>
     </message>
     <message>
         <source>write</source>
-        <translation type="unfinished"></translation>
+        <translation>skrive</translation>
     </message>
     <message>
         <source>execute</source>
+        <translation>utføre</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index 38c15aa..88ffc08 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -1,270 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
+        <translation>Stiler kontroller måten objekter som knapper og rullefelt vises på i alle applikasjoner
+
+Klikk her for å velge en av de tilgjengelige stilene.</translation>
     </message>
     <message>
         <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Innstillinger...</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å konfigurere den valgte stilen.
+
+Merk: Dette valget er ikke tilgjengelig for alle stiler.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vindusdekorer kontroller måten applikasjoners tittellinje og knapper vises.
+
+Klikk her for å velge en tilgjengelig dekor.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Velg ønsket navn, stil og størrelse på standard tegnsett som applikasjonene vil bruke.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fargesystemer er en samling av farger som blir brukt av forskjellige deler av visningen.
+
+Klikk her for å velge et tilgjengelig fargesystem.</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Nåværende fargesystem</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Rediger...</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å endre farger i nåværende fargesystem.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å slette valgte fargesystem i listen til venstre.</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her å gi det nåværende fargesystemet et navn og lagre den.</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Påfør stilen på alle applikasjoner.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å tillate alle applikasjoner å bruke globale visningsinnstillinger.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
+        <translation>Slå av stil for disse applikasjoner (&lt;b&gt;*&lt;/b&gt; kan bli brukt som wildcard):</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Om noen applikasjoner ikke vises korrekt med globale visningsinnstillinger, kan visse funksjoner skues av for disse applikasjonene.
+
+Dette området tillater deg å velge en applikasjon og hvilke innstillinger du vil slå av.</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Binær fil(er)</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å legge til en applikasjon på listen ovenfor.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å slette den nåværende valgte applikasjon.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å flytte den nåværende valgte applikasjon opp på listen.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å flytte den nåværende valgte applikasjon ned på listen.</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fane stil:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å velge ønsket stil for fanebaserte dialoger (som denne applikasjonen). Tilgjengelige stiler er:
+
+1. Faner - normale faner med bare tekst
+2. Faner m/ikoner - faner med ikoner for hver fane og hvor tekst kun vises på aktiv fane
+3. Rullegardinmeny - en vertikal liste av faner
+4. Rullegardinmeny m/ikoner - en vertikal liste av faner med ikoner </translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Faner</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Faner m/ikoner</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation type="unfinished"></translation>
+        <translation>Rullegardinmeny</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Rullegardinmeny m/ikoner</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Topp</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her slik at fanene vises på toppen av vinduet.</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Bunn</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her slik at fanene vises på bunnen av vinduet.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotasjonsretning:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Visningsinnstillinger</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette er et forhåndsvisningsvindu. Kikk her for å se din nye visning da innstillingene er endret.</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Tegnsett</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Farger</translation>
     </message>
     <message>
         <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Avansert</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation>Omstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Vil du starte om %1 nå?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre system</translation>
     </message>
     <message>
         <source>Save scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre system</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemet eksisterer allerede.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett system</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kan ikke slette nåværende system.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;ny&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Rediger system</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å velge farge for:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
-        <translation type="unfinished"></translation>
+        <translation>Prøve</translation>
     </message>
     <message>
         <source>Normal Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalt objekt</translation>
     </message>
     <message>
         <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Avslått objekt</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Meny</translation>
     </message>
     <message>
         <source>Normal Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Normal Tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Markert Tekst</translation>
     </message>
     <message>
         <source>Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Knapp</translation>
     </message>
     <message>
         <source>Check Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Avkrysningsboks</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prøvevindu som viser valgte innstillinger.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index 348cc10..6af9d28 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -1,546 +1,689 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategori filter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Velg en eller flere grupper</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
+        <translation>Leser konfigurasjon...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Avbryt</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Lukk</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fjern
+</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Installer
+</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgrader
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Installer på nytt)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Oppgrader)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilgjengelig plass</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Utdata</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Valg</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Avbryt</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Bruker har klikket AVBRYT ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Prosessen er blitt avbrutt ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Lagre utdata</translation>
     </message>
     <message>
         <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Valg</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving avhengigheter</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving reinstallering</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving sletting</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Tving overskrivning</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Informasjonsnivå</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Kun feil</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale meldinger</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Informative meldinger</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
+        <translation>Feilsøking utdata</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>AQPkg - Pakke behandler</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv teksten for å lete her.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å skjule snarvei verktøylinjen.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater lister</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å oppdatere pakkelister fra servere.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgrader</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å oppgradere alle installerte pakker dersom en nyere versjon er tilgjengelig.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Last ned</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å laste ned de valgte pakkene. </translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater endringer</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for installere, fjerne eller oppgradere valgte pakker.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Handlinger</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis ikke-installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er tilgjengelige, men som ikke er installert.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis installerte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er installert på denne enheten.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis oppdaterte pakker</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise pakker som er installert på enheten som har en nyere versjon tilgjengelig.</translation>
     </message>
     <message>
         <source>Filter by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrer etter kategori</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for vise liste over pakker som tilhører en kategori.</translation>
     </message>
     <message>
         <source>Set filter category</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett filtrer kategori</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å endre pakke kategori til brukt filter.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Finn</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å søke etter tekst i navnene til pakkene.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Finn neste</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å finne den neste pakken som inneholder teksten som du søker etter.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
+        <translation>Snarvei tastatur</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å vise/skjule tastatur for å tillate hurtig bevegelse gjennom pakkelisten.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vis</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å konfigurere denne applikasjonen.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å skjule Søk verktøylinjen.</translation>
     </message>
     <message>
         <source>Servers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servere:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å velge en pakke tilførselskanal.</translation>
     </message>
     <message>
         <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakker</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dette er en liste over alle pakker tilgjengelige fra de ovenfor valgte servere.  
+
+Et blått punkt ved siden av navnet på pakken indikerer at pakken er installert.
+
+Et blått punkt med en stjerne viser at en nyere versjon av pakken er tilgjengelig for nedlasting.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Klikk her for å slette valgte pakker.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Bygger server liste
+</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Bygger pakkeliste for:
+</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdaterer pakkelister fra server</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>ADVARSEL: Oppgradering mens
+Opie/qtopia kjører
+er IKKE anbefalt!</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Advarsel</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppgraderer installerte pakker</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Er du sikker på at du ønsker å slette
+%1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Er du sikker?</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nei</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation type="unfinished"></translation>
+        <translation>Laste ned til?</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv sti til nedlast til</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Installer ekstern pakke</translation>
     </message>
     <message>
         <source>Enter package location</source>
-        <translation type="unfinished"></translation>
+        <translation>Skriv sti for pakke</translation>
     </message>
     <message>
         <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
+        <translation>Intet å gjøre</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Ingen pakker valgt</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ønsker du å slette eller reinstallere
+%1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Slette eller reinstallere</translation>
     </message>
     <message>
         <source>ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Reinstallere</translation>
     </message>
     <message>
         <source>R</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">R</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Ønsker du å slette eller oppgradere
+%1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Slette eller oppgradere</translation>
     </message>
     <message>
         <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdaterer Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Beskrivelse&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Innstallert til&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Størrelse&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Seksjon&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Filnavn&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Versjon installert&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Versjon tilgjengelig&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakke informasjon</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakke informasjon er ikke tilgjengelig</translation>
     </message>
     <message>
         <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Slett</translation>
+    </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Innstillinger</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Servere</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjoner</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxier</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Ny</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Slett</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Navn:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktiv server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Oppdater</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinasjon</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sted:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation>Lenke til root</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Tilgjengelig</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Brukernavn:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passord:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/backgammon.ts b/i18n/no/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/no/backgammon.ts
+++ b/i18n/no/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/backup.ts b/i18n/no/backup.ts
index 02b6cc2..e90fc17 100644
--- a/i18n/no/backup.ts
+++ b/i18n/no/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/bounce.ts b/i18n/no/bounce.ts
index 9d2d3d1..4a3035b 100644
--- a/i18n/no/bounce.ts
+++ b/i18n/no/bounce.ts
@@ -1,100 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/calibrate.ts b/i18n/no/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/no/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 2851c82..9d60723 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/clock.ts b/i18n/no/clock.ts
index bd9e904..7a06907 100644
--- a/i18n/no/clock.ts
+++ b/i18n/no/clock.ts
@@ -1,93 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
-        <translation type="unfinished"></translation>
+        <translation>Blunde</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
-        <translation type="unfinished"></translation>
+        <translation>Klokke</translation>
     </message>
     <message>
         <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
+        <translation>Stoppeklokke</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Nullstill</translation>
     </message>
     <message>
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Still inn alarm</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sett dato og tid.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarm PÅ</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarm AV</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
+        <translation>Klokke: Alarm ble oversett.</translation>
+    </message>
+    <message>
+        <source>Alarm set: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Still inn alarm</translation>
     </message>
     <message>
         <source>Hour</source>
-        <translation type="unfinished"></translation>
+        <translation>Time</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished"></translation>
+        <translation>Minutter</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>mp3 alarm</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation type="unfinished"></translation>
+        <translation>Utsett
+(minutter)</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Lyd</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 7cc5f42..2020a7d 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -1,804 +1,796 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</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>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</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>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</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>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/drawpad.ts b/i18n/no/drawpad.ts
index 229dfbc..edaf6ea 100644
--- a/i18n/no/drawpad.ts
+++ b/i18n/no/drawpad.ts
@@ -1,435 +1,443 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/euroconv.ts b/i18n/no/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/no/euroconv.ts
+++ b/i18n/no/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/filebrowser.ts b/i18n/no/filebrowser.ts
deleted file mode 100644
index a7e2016..0000000
--- a/i18n/no/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/no/formatter.ts b/i18n/no/formatter.ts
index 751e732..b1fd5b4 100644
--- a/i18n/no/formatter.ts
+++ b/i18n/no/formatter.ts
@@ -1,161 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
+        <source>Card mount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card mount failed!</source>
+        <source>You can now close the output window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
+        <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You can now close the output window.</source>
+        <source>Total: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal</source>
+        <source>Used: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage Type : </source>
+        <source>Available: %1 kB ( %d mB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
+        <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available: %1 kB ( %d mB)</source>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/helpbrowser.ts b/i18n/no/helpbrowser.ts
index 4951556..81e4b05 100644
--- a/i18n/no/helpbrowser.ts
+++ b/i18n/no/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
+        <source>Go</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/kpacman.ts b/i18n/no/kpacman.ts
index fb73268..7546bd0 100644
--- a/i18n/no/kpacman.ts
+++ b/i18n/no/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/launchersettings.ts b/i18n/no/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/no/launchersettings.ts
+++ b/i18n/no/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libfreetypefactory.ts b/i18n/no/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/nl/libfreetypefactory.ts
+++ b/i18n/no/lib.ts
diff --git a/i18n/unmaintained/no/libbend.ts b/i18n/no/libbend.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/no/libbend.ts
+++ b/i18n/no/libbend.ts
diff --git a/i18n/no/libclockapplet.ts b/i18n/no/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/no/libclockapplet.ts
+++ b/i18n/no/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/no/libflatstyle.ts b/i18n/no/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/no/libflatstyle.ts
+++ b/i18n/no/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libinterfaces.ts b/i18n/no/libinterfaces.ts
index 407ea1f..8239ed9 100644
--- a/i18n/no/libinterfaces.ts
+++ b/i18n/no/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libkeyview.ts b/i18n/no/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/no/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/no/libkppp.ts b/i18n/no/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/no/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libmadplugin.ts b/i18n/no/libmadplugin.ts
new file mode 100644
index 0000000..805e03a
--- a/dev/null
+++ b/i18n/no/libmadplugin.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LibMadPlugin</name>
+    <message>
+        <source>No Song Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Info: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Genre: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bitrate: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Artist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Album</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Track: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ko/libmail.ts b/i18n/no/libmail.ts
index 78c7198..78c7198 100644
--- a/i18n/unmaintained/ko/libmail.ts
+++ b/i18n/no/libmail.ts
diff --git a/i18n/nl/librestartapplet.ts b/i18n/no/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/nl/librestartapplet.ts
+++ b/i18n/no/libmodplugin.ts
diff --git a/i18n/no/libopie.ts b/i18n/no/libopie.ts
index b78f90c..24385f3 100644
--- a/i18n/no/libopie.ts
+++ b/i18n/no/libopie.ts
@@ -1,108 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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="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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on </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>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libopieobex.ts b/i18n/no/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/no/libopieobex.ts
+++ b/i18n/no/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index b75236e..935ab0b 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -1,886 +1,939 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Category </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</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>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Department</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Children</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/unmaintained/ja/libqunikeyboard.ts b/i18n/no/libqunikeyboard.ts
index 6966daa..6966daa 100644
--- a/i18n/unmaintained/ja/libqunikeyboard.ts
+++ b/i18n/no/libqunikeyboard.ts
diff --git a/i18n/unmaintained/ja/libsuspendapplet.ts b/i18n/no/libsuspendapplet.ts
index bdfb04c..bdfb04c 100644
--- a/i18n/unmaintained/ja/libsuspendapplet.ts
+++ b/i18n/no/libsuspendapplet.ts
diff --git a/i18n/unmaintained/ja/libtheme.ts b/i18n/no/libtheme.ts
index 53a4018..53a4018 100644
--- a/i18n/unmaintained/ja/libtheme.ts
+++ b/i18n/no/libtheme.ts
diff --git a/i18n/no/libtodayaddressbookplugin.ts b/i18n/no/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/no/libtodayaddressbookplugin.ts
+++ b/i18n/no/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libtodaydatebookplugin.ts b/i18n/no/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/no/libtodaydatebookplugin.ts
+++ b/i18n/no/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libtodaytodolistplugin.ts b/i18n/no/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/no/libtodaytodolistplugin.ts
+++ b/i18n/no/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/nl/sfcave-sdl.ts b/i18n/no/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/nl/sfcave-sdl.ts
+++ b/i18n/no/libtremorplugin.ts
diff --git a/i18n/unmaintained/ja/libvmemoapplet.ts b/i18n/no/libvmemoapplet.ts
index 8371675..8371675 100644
--- a/i18n/unmaintained/ja/libvmemoapplet.ts
+++ b/i18n/no/libvmemoapplet.ts
diff --git a/i18n/no/libvolumeapplet.ts b/i18n/no/libvolumeapplet.ts
new file mode 100644
index 0000000..37505f1
--- a/dev/null
+++ b/i18n/no/libvolumeapplet.ts
@@ -0,0 +1,21 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VolumeControl</name>
+    <message>
+        <source>Enable Sounds for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screen Taps</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key Clicks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Sound</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/zh_CN/libwavplugin.ts b/i18n/no/libwavplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/zh_CN/libwavplugin.ts
+++ b/i18n/no/libwavplugin.ts
diff --git a/i18n/unmaintained/ja/libwirelessapplet.ts b/i18n/no/libwirelessapplet.ts
index cdfb61d..cdfb61d 100644
--- a/i18n/unmaintained/ja/libwirelessapplet.ts
+++ b/i18n/no/libwirelessapplet.ts
diff --git a/i18n/no/libwlan.ts b/i18n/no/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/no/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libwlanplugin.ts b/i18n/no/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/no/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ko/mail.ts b/i18n/no/mail.ts
index d251908..d251908 100644
--- a/i18n/unmaintained/ko/mail.ts
+++ b/i18n/no/mail.ts
diff --git a/i18n/no/mailit.ts b/i18n/no/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/no/mailit.ts
+++ b/i18n/no/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/mediummount.ts b/i18n/no/mediummount.ts
index 77a2879..8f647e3 100644
--- a/i18n/no/mediummount.ts
+++ b/i18n/no/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
     <message>
         <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/networksettings.ts b/i18n/no/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/no/networksettings.ts
+++ b/i18n/no/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/odict.ts b/i18n/no/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/no/odict.ts
+++ b/i18n/no/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/oipkg.ts b/i18n/no/oipkg.ts
deleted file mode 100644
index 1f93af3..0000000
--- a/i18n/no/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/no/opie-console.ts b/i18n/no/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/no/opie-console.ts
+++ b/i18n/no/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/opie-login.ts b/i18n/no/opie-login.ts
new file mode 100644
index 0000000..71d25f7
--- a/dev/null
+++ b/i18n/no/opie-login.ts
@@ -0,0 +1,83 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LoginWindow</name>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suspend</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LoginWindowImpl</name>
+    <message>
+        <source>Restart</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrong password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The given password is incorrect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not switch to new user identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/opieirc.ts b/i18n/no/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/no/opieirc.ts
+++ b/i18n/no/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/opieplayer.ts b/i18n/no/opieplayer.ts
new file mode 100644
index 0000000..f197939
--- a/dev/null
+++ b/i18n/no/opieplayer.ts
@@ -0,0 +1,258 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AudioDevice</name>
+    <message>
+        <source>Somethin&apos;s wrong with
+your sound device.
+open(&quot;/dev/dsp&quot;)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+
+Closing player now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AudioWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MediaPlayer</name>
+    <message>
+        <source>No file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error: There is no file selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The following file was not found: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No decoder found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error opening file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, Length: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListSelection</name>
+    <message>
+        <source>Playlist Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PlayListWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Operations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from Playlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Randomize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all audio files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all video files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add all files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save PlayList</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open File or URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Audio Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan for Video Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Skins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Audio</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Video</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There was a problem in getting the file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to delete
+this playlist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file or URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save m3u Playlist </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VideoWidget</name>
+    <message>
+        <source>OpiePlayer</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/opieplayer2.ts b/i18n/no/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/no/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/no/opierec.ts b/i18n/no/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/no/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/osearch.ts b/i18n/no/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/no/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/patience.ts b/i18n/no/patience.ts
new file mode 100644
index 0000000..09b12d7
--- a/dev/null
+++ b/i18n/no/patience.ts
@@ -0,0 +1,73 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CanvasCardWindow</name>
+    <message>
+        <source>Patience</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Freecell</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chicane</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Harp</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Teeclub</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/qpdf.ts b/i18n/no/qpdf.ts
index 2f03c32..828cbdf 100644
--- a/i18n/no/qpdf.ts
+++ b/i18n/no/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>50%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>75%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>125%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>150%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist !</source>
+        <source>File does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index 56f6b51..73a6c49 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/reader.ts b/i18n/no/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/no/reader.ts
+++ b/i18n/no/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 82edfac..5720dc2 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -1,105 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
new file mode 100644
index 0000000..c04fa35
--- a/dev/null
+++ b/i18n/no/showimg.ts
@@ -0,0 +1,158 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>ControlsDialog</name>
+    <message>
+        <source>Brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageFileSelector</name>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ImageViewer</name>
+    <message>
+        <source>Image Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnail View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preferences..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image Info ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Horizontal flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vertical flip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 90</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 180</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rotate 270</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Brightness ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Black And White</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale to Screen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop Slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - Image Viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> True color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 alpha levels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8-bit alpha channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SettingsDialogBase</name>
+    <message>
+        <source>Preferences</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Slide Show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delay between pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat slideshow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show pictures in reverse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load pictures rotated 90 degrees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fast load pictures</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/snake.ts b/i18n/no/snake.ts
new file mode 100644
index 0000000..1a1e3e6
--- a/dev/null
+++ b/i18n/no/snake.ts
@@ -0,0 +1,40 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SnakeGame</name>
+    <message>
+        <source>Snake</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SNAKE!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use the arrow keys to guide the
+snake to eat the mouse. You must not
+crash into the walls, edges or its tail.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>     Score :    %1   </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GAME OVER!
+ Your Score: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/sound.ts b/i18n/no/sound.ts
new file mode 100644
index 0000000..0d4b825
--- a/dev/null
+++ b/i18n/no/sound.ts
@@ -0,0 +1,128 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SoundSettings</name>
+    <message>
+        <source>Shows icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hides icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SoundSettingsBase</name>
+    <message>
+        <source>Vmemo Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16 bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Visual Alerts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>33075</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recording Directory:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recording Key:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Taskbar Icon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Record</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Calender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Menu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key_Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recording Limit in seconds:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>30</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>15</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Opie if needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/unmaintained/ja/sshkeys.ts b/i18n/no/sshkeys.ts
index 20e2db6..20e2db6 100644
--- a/i18n/unmaintained/ja/sshkeys.ts
+++ b/i18n/no/sshkeys.ts
diff --git a/i18n/no/stockticker.ts b/i18n/no/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/no/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/sysinfo.ts b/i18n/no/sysinfo.ts
new file mode 100644
index 0000000..a051370
--- a/dev/null
+++ b/i18n/no/sysinfo.ts
@@ -0,0 +1,272 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModulesInfo</name>
+    <message>
+        <source>Module</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the kernel modules currently loaded on this handheld device.
+
+Click and hold on a module to see additional information about the module, or to unload it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the selected command to the module selected above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this module.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MountInfo</name>
+    <message>
+        <source> : %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ProcessInfo</name>
+    <message>
+        <source>PID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a list of all the processes on this handheld device.
+
+Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the selected signal to this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This area shows detailed information about this process.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SystemInfo</name>
+    <message>
+        <source>System Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>VersionInfo</name>
+    <message>
+        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Compiled by: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Built on: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Version: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/systemtime.ts b/i18n/no/systemtime.ts
index c68c7e9..aa9898a 100644
--- a/i18n/no/systemtime.ts
+++ b/i18n/no/systemtime.ts
@@ -1,250 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/unmaintained/ja/tableviewer.ts b/i18n/no/tableviewer.ts
index 7d41b6f..7d41b6f 100644
--- a/i18n/unmaintained/ja/tableviewer.ts
+++ b/i18n/no/tableviewer.ts
diff --git a/i18n/no/tabmanager.ts b/i18n/no/tabmanager.ts
new file mode 100644
index 0000000..a659991
--- a/dev/null
+++ b/i18n/no/tabmanager.ts
@@ -0,0 +1,87 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AppEdit</name>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Exec:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabManager</name>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove with applications
+still in the group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TabManagerBase</name>
+    <message>
+        <source>Tab Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hierarchy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Wait</name>
+    <message>
+        <source>Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/tetrix.ts b/i18n/no/tetrix.ts
new file mode 100644
index 0000000..4f7b960
--- a/dev/null
+++ b/i18n/no/tetrix.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QTetrix</name>
+    <message>
+        <source>Tetrix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Score</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/textedit.ts b/i18n/no/textedit.ts
new file mode 100644
index 0000000..011e5a1
--- a/dev/null
+++ b/i18n/no/textedit.ts
@@ -0,0 +1,268 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TextEdit</name>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced Features</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start with new file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompt on Exit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always open linked file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search Bar Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>.desktop File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked Document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/tictac.ts b/i18n/no/tictac.ts
new file mode 100644
index 0000000..f8eccb8
--- a/dev/null
+++ b/i18n/no/tictac.ts
@@ -0,0 +1,48 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click Play to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Make your move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You won!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Computer won!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>It&apos;s a draw</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/tinykate.ts b/i18n/no/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/no/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
new file mode 100644
index 0000000..b2add99
--- a/dev/null
+++ b/i18n/no/today.ts
@@ -0,0 +1,138 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Today</name>
+    <message>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to launch the associated app</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No plugins found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No plugins activated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayBase</name>
+    <message>
+        <source>Today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Today by Maximilian Rei&#xdf;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to get to the config dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfig</name>
+    <message>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load which plugins in what order:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>active/order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
new file mode 100644
index 0000000..3562af1
--- a/dev/null
+++ b/i18n/no/todolist.ts
@@ -0,0 +1,581 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View Task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show only over-due tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QuickEdit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out of space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo was unable
+to save your changes.
+Free up some space
+and try again.
+
+Quit Anyway?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>all completed tasks?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Templates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
+        <source>Table View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorAlarms</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter brief description of the task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Complete </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Organize </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Get </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plan </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Call </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select priority of task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select category to organize this task with.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurring task</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information about this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Summary:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TaskEditorStatus</name>
+    <message>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Postponed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>0 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>20 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>40 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>60 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>80 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>100 %</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was started.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Due Date:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Completed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to mark this task as completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the date this task was completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer Mode:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Responsible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Coordinating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/ubrowser.ts b/i18n/no/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/no/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/usermanager.ts b/i18n/no/usermanager.ts
new file mode 100644
index 0000000..28f3895
--- a/dev/null
+++ b/i18n/no/usermanager.ts
@@ -0,0 +1,31 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GroupDialog</name>
+    <message>
+        <source>Add Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UserConfig</name>
+    <message>
+        <source>Opie User Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UserDialog</name>
+    <message>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit User</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/wellenreiter.ts b/i18n/no/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/no/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/no/wordgame.ts b/i18n/no/wordgame.ts
new file mode 100644
index 0000000..f5bd88d
--- a/dev/null
+++ b/i18n/no/wordgame.ts
@@ -0,0 +1,133 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Board</name>
+    <message>
+        <source>Blanks: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown word</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ignore</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewGameBase</name>
+    <message>
+        <source>Players</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI3: Smart AI player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RulesBase</name>
+    <message>
+        <source>Game Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Board</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScoreInfo</name>
+    <message>
+        <source>&lt;P&gt;Invalid move</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;Score: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WordGame</name>
+    <message>
+        <source>Word Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to end the game early?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/opie-i18n-da.control b/i18n/opie-i18n-da.control
index 2bd15f9..064b1cd 100644
--- a/i18n/opie-i18n-da.control
+++ b/i18n/opie-i18n-da.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-da
 Files: i18n/da/.directory i18n/da/*.qm
 Priority: optional
 Section: opie/i18n
-Maintainer: Tais M. Hansen <mellen@handhelds.org>
+Maintainer: Niels Andersen <animal@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Danish
  Danish UI texts for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-de.control b/i18n/opie-i18n-de.control
index c19c4ad..fb8f964 100644
--- a/i18n/opie-i18n-de.control
+++ b/i18n/opie-i18n-de.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-de
 Files: i18n/de/.directory i18n/de/*.qm etc/dict/dawg.de
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Deutsch
  German UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-en.control b/i18n/opie-i18n-en.control
index 5725116..5a039f6 100644
--- a/i18n/opie-i18n-en.control
+++ b/i18n/opie-i18n-en.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-en
 Files: i18n/en/.directory etc/dict/dawg
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: English
  English dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-es.control b/i18n/opie-i18n-es.control
index c3994fb..cc94dae 100644
--- a/i18n/opie-i18n-es.control
+++ b/i18n/opie-i18n-es.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-es
 Files: i18n/es/.directory i18n/es/*.qm etc/dict/dawg.es
 Priority: optional
 Section: opie/i18n
 Maintainer: Jose Luis Fernandez Barros <fbarros@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Spanish
  Spanish UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-fr.control b/i18n/opie-i18n-fr.control
index 490282e..959c2f6 100644
--- a/i18n/opie-i18n-fr.control
+++ b/i18n/opie-i18n-fr.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-fr
 Files: i18n/fr/.directory i18n/fr/*.qm etc/dict/dawg.fr
 Priority: optional
 Section: opie/i18n
-Maintainer: Amrein-Marie Christophe <Christophe.Amrein-Marie@wanadoo.fr>
+Maintainer: Amrein-Marie Christophe <christophe@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: French
  French UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-hu.control b/i18n/opie-i18n-hu.control
index 4bc10a3..d1193d4 100644
--- a/i18n/opie-i18n-hu.control
+++ b/i18n/opie-i18n-hu.control
@@ -1,11 +1,11 @@
 Package: opie-i18n-hu
 Files: i18n/hu/.directory i18n/hu/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Magyar
  Hungarian UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-it.control b/i18n/opie-i18n-it.control
index 81a2030..de45196 100644
--- a/i18n/opie-i18n-it.control
+++ b/i18n/opie-i18n-it.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-it
 Files: i18n/it/.directory i18n/it/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Daniele Foci <sunscan@sunscan.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Italian
  Italian UI texts for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-mk.control b/i18n/opie-i18n-mk.control
new file mode 100644
index 0000000..4e85b08
--- a/dev/null
+++ b/i18n/opie-i18n-mk.control
@@ -0,0 +1,10 @@
+Package: opie-i18n-mk
+Files: i18n/mk/.directory i18n/mk/*.qm
+Priority: optional
+Section: opie/i18n
+Maintainer: Darko Nikolovski <arkon@macedonia.homelinux.org>
+Architecture: arm
+Depends: task-opie-minimal, opie-language
+Description: i18n: Makedonian
+ Makedonian UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-nl.control b/i18n/opie-i18n-nl.control
index 424f2bd..8921aed 100644
--- a/i18n/opie-i18n-nl.control
+++ b/i18n/opie-i18n-nl.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-nl
 Files: i18n/nl/.directory i18n/nl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Ruben Lubbes <sikko@theendofinter.net>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Dutch
  Dutch UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-pl.control b/i18n/opie-i18n-pl.control
index b0fbb7e..d79f3d6 100644
--- a/i18n/opie-i18n-pl.control
+++ b/i18n/opie-i18n-pl.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-pl
 Files: i18n/pl/.directory i18n/pl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Rozanski Sergiusz <rozanski@sergiusz.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Polish
  Polish UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-pt.control b/i18n/opie-i18n-pt.control
index 1b11653..5181923 100644
--- a/i18n/opie-i18n-pt.control
+++ b/i18n/opie-i18n-pt.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-pt
 Files: i18n/pt/.directory i18n/pt/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Portuguese
  Portuguese UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-ptbr.control b/i18n/opie-i18n-ptbr.control
index 5371baa..e8c892f 100644
--- a/i18n/opie-i18n-ptbr.control
+++ b/i18n/opie-i18n-ptbr.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-ptbr
 Files: i18n/pt_BR/.directory i18n/pt_BR/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Bruno Rodrigues <bruno.rodrigues@litux.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Brasilian 
  Brasilian Portuguese UI texts and dictionary for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-sl.control b/i18n/opie-i18n-sl.control
index 98f2074..814fabd 100644
--- a/i18n/opie-i18n-sl.control
+++ b/i18n/opie-i18n-sl.control
@@ -1,11 +1,11 @@
 Package: opie-i18n-sl
 Files: i18n/sl/.directory i18n/sl/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Matej Dakol <matej.dakol@gvskupina.si>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
 Description: i18n: Slovenian
  Slovenian UI texts for OPIE environment and dictionary.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-xx.control b/i18n/opie-i18n-xx.control
index 5b1d611..b23ebce 100644
--- a/i18n/opie-i18n-xx.control
+++ b/i18n/opie-i18n-xx.control
@@ -1,10 +1,10 @@
 Package: opie-i18n-xx
 Files: i18n/xx/.directory i18n/xx/*.qm 
 Priority: optional
 Section: opie/i18n
 Maintainer: Carsten Niehaus <cniehaus@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, opie-language
 Description: i18n: Testlanguage
  This is for testing the i18n-abilities of a OPIE-app
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/opie-i18n-zh-tw.control b/i18n/opie-i18n-zh-tw.control
index be06adc..c47aa7a 100644
--- a/i18n/opie-i18n-zh-tw.control
+++ b/i18n/opie-i18n-zh-tw.control
@@ -1,11 +1,11 @@
 Package: opie-i18n-zh-tw
 Files: i18n/zh_TW/.directory i18n/zh_TW/*.qm
 Priority: optional
 Section: opie/i18n
 Maintainer: Carstem Niehaus <cniehaus@kde.org>
 Architecture: arm
 Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, qpf-cyberbit-120-50-t10, opie-language
 Description: i18n: Chinese (TW)
  Chinese UI texts for OPIE environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/i18n/pl/.directory b/i18n/pl/.directory
index ab1c9d7..ff04f13 100644
--- a/i18n/pl/.directory
+++ b/i18n/pl/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Polish
 Name[da]=Polsk
 Name[es]=Polaco
 Name[it]=Polacco
 Name[pt]=Polaco
 Name[pt_BR]=Polaco
 Name[sl]=Polščina
+Name[de]=Polnisch
+Name[nl]=Pools
\ No newline at end of file
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index c3bcdca..9cfdc2e 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -1,1508 +1,1514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Pelna Nazwa</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Elita</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Kontakt</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Znajdz</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Napisz e-mail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation>Zgloszenia</translation>
+        <translation>Emituj wpis</translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation>Moje dane</translation>
+        <translation>Moje dane osobiste</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie mozna zmieniac danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
-        <translation>Edycja moich danych</translation>
+        <translation>Edycja moich danych osobistych</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Edycja adresu</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
-        <translation>Kontakty - moje dane</translation>
+        <translation>Kontakty - moje dane osobiste</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamieci</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie mozna zapisac informacji.
-Zwilnij miejsce w pamieci
+Zwolnij miejsce w pamieci
 i sprobuj ponownie
 
 Zakonczyc?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>nieprzydzielony</translation>
+        <translation>Nieprzydzielony</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Importuj wizytowke (vCard)</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij Wyszukiwarke</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wszystkie dane</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Not Found</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie znaleziono</translation>
     </message>
     <message>
         <source>List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation type="unfinished"></translation>
+        <translation>Wizytowki</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Wizytowka</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukaj</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlasciwy typ pliku?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nie</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>Nie znaleziono wizytowki odpowiadajacej
+warunkom wyszukiwania!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybrany plik
+nie konczy sie &quot;.vcf&quot;.
+Czy na pewno chcesz go otworzyc?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodac wizytowke?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz dodac wizytowke
+%1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak na &amp;Wszystkie</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksportuj wizytowke (vCard)</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation type="unfinished"></translation>
+        <translation>Musisz wybrac wizytowke!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation type="unfinished"></translation>
+        <translation>Musisz podac nazwe pliku!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl zapytania</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj wyrazen regularnych</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj znakow specjalnych (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Wrazliwe na wilkosc liter</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Poczta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>Preferuj QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferuj Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation type="unfinished"></translation>
+        <translation>Uwaga: QT-mail jest zalaczony
+jedynie w oryginalnym ROM&apos;ie
+SHARP&apos;a. Opie-Mail jest
+dostepny za darmo!</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozne</translation>
     </message>
     <message>
         <source>Search Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia wyszukiwania</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished">Czcionka</translation>
+        <translation>Czcionka</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished">Maly</translation>
+        <translation>Mala</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished">Normalny</translation>
+        <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished">Duzy</translation>
+        <translation>Duza</translation>
     </message>
     <message>
         <source>Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolejnosc</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz kolejnosc wizytowek:</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">Gora</translation>
+        <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">Dol</translation>
+        <translation>Dol</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij na zakladce aby ja wybrac</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia stylu zapytania</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;Widget&quot; wyszukiwarki bedzie oczekiwal wyrazen regularnych</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&quot;Widget&quot; wyszukiwarki oczekuje tylko prostych znakow specjalnych</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wyszukiwarka bedzie rozrozniala wielkosc znakow</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Wielkosc czcionki dla listy i wizytowki</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia czcionki dla listy i wizytowki</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj aplikacji pocztowej Sharp&apos;a, jesli jest dostepna</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj aplikacji pocztowej OPIE, jesli jest zainstalowana</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun wybrany atrybut jedna o pozycje do gory</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun wybrany atrybut jedna o pozycje do dolu</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz wszystkie dostepne atrybuty</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj wybrany atrybut z dolnej listy do gornej listy</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun wybrany atrybut z gornej listy</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolejnosc (gora -&gt; dol) definiuje glowny kontakt wyswietlany w drugiej kolumnie na liscie wizytowek</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Narzedzia/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>Stale</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien Narzedzia/Menu na Stale po ponownym uruchomieniu programu!</translation>
     </message>
     <message>
         <source>Moveable</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesuwane</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien Narzedzia/Menu na Przesuwane po ponownym uruchomieniu programu!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Jako</translation>
+        <translation>Pokazuj jako</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Temat pracy</translation>
+        <translation>Stanowisko</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>State</source>
-        <translation>Wojewodztwo</translation>
+        <translation>Region</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Panstwo</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Pelna nazwa...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Notes...</source>
-        <translation>Notatka...</translation>
+        <translation>Notatki...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
         <source>Business</source>
-        <translation>Biznes</translation>
+        <translation>Firma</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Kod pocztowy</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Stany Zjednoczone</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Anglia</translation>
     </message>
     <message>
         <source>Albania</source>
-        <translation type="unfinished"></translation>
+        <translation>Albania</translation>
     </message>
     <message>
         <source>Algeria</source>
-        <translation type="unfinished"></translation>
+        <translation>Algieria</translation>
     </message>
     <message>
         <source>American Samoa</source>
-        <translation type="unfinished"></translation>
+        <translation>Samoa Amerykanska</translation>
     </message>
     <message>
         <source>Andorra</source>
-        <translation type="unfinished"></translation>
+        <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
-        <translation type="unfinished"></translation>
+        <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
-        <translation type="unfinished"></translation>
+        <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
-        <translation type="unfinished"></translation>
+        <translation>Argentyna</translation>
     </message>
     <message>
         <source>Aruba</source>
-        <translation type="unfinished"></translation>
+        <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
-        <translation type="unfinished"></translation>
+        <translation>Australia</translation>
     </message>
     <message>
         <source>Austria</source>
-        <translation type="unfinished"></translation>
+        <translation>Austria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
+        <translation>Azerbejdzan</translation>
     </message>
     <message>
         <source>Bahamas</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahama</translation>
     </message>
     <message>
         <source>Bahrain</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
+        <translation>Bangladesz</translation>
     </message>
     <message>
         <source>Barbados</source>
-        <translation type="unfinished"></translation>
+        <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
-        <translation type="unfinished"></translation>
+        <translation>Bialorus</translation>
     </message>
     <message>
         <source>Belgium</source>
-        <translation type="unfinished"></translation>
+        <translation>Belgia</translation>
     </message>
     <message>
         <source>Belize</source>
-        <translation type="unfinished"></translation>
+        <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
-        <translation type="unfinished"></translation>
+        <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
-        <translation type="unfinished"></translation>
+        <translation>Bermudy</translation>
     </message>
     <message>
         <source>Bhutan</source>
-        <translation type="unfinished"></translation>
+        <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
-        <translation type="unfinished"></translation>
+        <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
-        <translation type="unfinished"></translation>
+        <translation>Brazylia</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
+        <translation>Brunei</translation>
     </message>
     <message>
         <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
+        <translation>Bulgaria</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
+        <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
-        <translation type="unfinished"></translation>
+        <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
-        <translation type="unfinished"></translation>
+        <translation>Kambodza</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Kajmany</translation>
     </message>
     <message>
         <source>Chad</source>
-        <translation type="unfinished"></translation>
+        <translation>Czad</translation>
     </message>
     <message>
         <source>Chile</source>
-        <translation type="unfinished"></translation>
+        <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
-        <translation type="unfinished"></translation>
+        <translation>Chiny</translation>
     </message>
     <message>
         <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyspa Bozego Narodzenia</translation>
     </message>
     <message>
         <source>Colombia</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolumbia</translation>
     </message>
     <message>
         <source>Comoros</source>
-        <translation type="unfinished"></translation>
+        <translation>Komory</translation>
     </message>
     <message>
         <source>Congo</source>
-        <translation type="unfinished"></translation>
+        <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyspy Cooka</translation>
     </message>
     <message>
         <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
+        <translation>Kostaryka</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybrzeze Kosci Sloniowej</translation>
     </message>
     <message>
         <source>Croatia</source>
-        <translation type="unfinished"></translation>
+        <translation>Chorwacja</translation>
     </message>
     <message>
         <source>Cuba</source>
-        <translation type="unfinished"></translation>
+        <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
-        <translation type="unfinished"></translation>
+        <translation>Cypr</translation>
     </message>
     <message>
         <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
+        <translation>Czechy</translation>
     </message>
     <message>
         <source>Denmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Dania</translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzibuti</translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominika</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominikana</translation>
     </message>
     <message>
         <source>East Timor</source>
-        <translation type="unfinished"></translation>
+        <translation>Timor Wschodni</translation>
     </message>
     <message>
         <source>Ecuador</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekwador</translation>
     </message>
     <message>
         <source>Egypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Egipt</translation>
     </message>
     <message>
         <source>El Salvador</source>
-        <translation type="unfinished"></translation>
+        <translation>Salwador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Gwinea Rownikowa</translation>
     </message>
     <message>
         <source>Eritrea</source>
-        <translation type="unfinished"></translation>
+        <translation>Erytrea</translation>
     </message>
     <message>
         <source>Estonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Estonia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
+        <translation>Etiopia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Falklandy</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Wyspy Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
-        <translation type="unfinished"></translation>
+        <translation>Fidzi</translation>
     </message>
     <message>
         <source>Finland</source>
-        <translation type="unfinished"></translation>
+        <translation>Finlandia</translation>
     </message>
     <message>
         <source>France</source>
-        <translation type="unfinished"></translation>
+        <translation>Francja</translation>
     </message>
     <message>
         <source>French Guiana</source>
-        <translation type="unfinished"></translation>
+        <translation>Gujana Francuska</translation>
     </message>
     <message>
         <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Polinezja Francuska</translation>
     </message>
     <message>
         <source>Gabon</source>
-        <translation type="unfinished"></translation>
+        <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
-        <translation type="unfinished"></translation>
+        <translation>Gambia</translation>
     </message>
     <message>
         <source>Georgia</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
-        <translation type="unfinished"></translation>
+        <translation>Niemcy</translation>
     </message>
     <message>
         <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
-        <translation type="unfinished"></translation>
+        <translation>Grecja</translation>
     </message>
     <message>
         <source>Greenland</source>
-        <translation type="unfinished"></translation>
+        <translation>Grenlandia</translation>
     </message>
     <message>
         <source>Grenada</source>
-        <translation type="unfinished"></translation>
+        <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation type="unfinished"></translation>
+        <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
-        <translation type="unfinished"></translation>
+        <translation>Gwatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Gwinea</translation>
     </message>
     <message>
         <source>Guyana</source>
-        <translation type="unfinished"></translation>
+        <translation>Gujana</translation>
     </message>
     <message>
         <source>Haiti</source>
-        <translation type="unfinished"></translation>
+        <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation type="unfinished"></translation>
+        <translation>Watykan</translation>
     </message>
     <message>
         <source>Honduras</source>
-        <translation type="unfinished"></translation>
+        <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
+        <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
-        <translation type="unfinished"></translation>
+        <translation>Wegry</translation>
     </message>
     <message>
         <source>Iceland</source>
-        <translation type="unfinished"></translation>
+        <translation>Islandia</translation>
     </message>
     <message>
         <source>India</source>
-        <translation type="unfinished"></translation>
+        <translation>Indie</translation>
     </message>
     <message>
         <source>Indonesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Indonezja</translation>
     </message>
     <message>
         <source>Ireland</source>
-        <translation type="unfinished"></translation>
+        <translation>Irlandia</translation>
     </message>
     <message>
         <source>Israel</source>
-        <translation type="unfinished"></translation>
+        <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlochy</translation>
     </message>
     <message>
         <source>Japan</source>
-        <translation type="unfinished"></translation>
+        <translation>Japonia</translation>
     </message>
     <message>
         <source>Jordan</source>
-        <translation type="unfinished"></translation>
+        <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Kazachstan</translation>
     </message>
     <message>
         <source>Kenya</source>
-        <translation type="unfinished"></translation>
+        <translation>Kenia</translation>
     </message>
     <message>
         <source>Korea</source>
-        <translation type="unfinished"></translation>
+        <translation>Korea</translation>
     </message>
     <message>
         <source>Laos</source>
-        <translation type="unfinished"></translation>
+        <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation type="unfinished"></translation>
+        <translation>Lotwa</translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation type="unfinished"></translation>
+        <translation>Liban</translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
-        <translation type="unfinished"></translation>
+        <translation>Liberia</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
+        <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
-        <translation type="unfinished"></translation>
+        <translation>Litwa</translation>
     </message>
     <message>
         <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
+        <translation>Luksemburg</translation>
     </message>
     <message>
         <source>Macau</source>
-        <translation type="unfinished"></translation>
+        <translation>Makao</translation>
     </message>
     <message>
         <source>Macedonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Macedonia</translation>
     </message>
     <message>
         <source>Madagascar</source>
-        <translation type="unfinished"></translation>
+        <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
-        <translation type="unfinished"></translation>
+        <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
-        <translation type="unfinished"></translation>
+        <translation>Malezja</translation>
     </message>
     <message>
         <source>Maldives</source>
-        <translation type="unfinished"></translation>
+        <translation>Malediwy</translation>
     </message>
     <message>
         <source>Mali</source>
-        <translation type="unfinished"></translation>
+        <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
-        <translation type="unfinished"></translation>
+        <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
-        <translation type="unfinished"></translation>
+        <translation>Martynika</translation>
     </message>
     <message>
         <source>Mauritania</source>
-        <translation type="unfinished"></translation>
+        <translation>Maurytania</translation>
     </message>
     <message>
         <source>Mauritius</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation type="unfinished"></translation>
+        <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
-        <translation type="unfinished"></translation>
+        <translation>Meksyk</translation>
     </message>
     <message>
         <source>Micronesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Mikronezja</translation>
     </message>
     <message>
         <source>Moldova</source>
-        <translation type="unfinished"></translation>
+        <translation>Moldawia</translation>
     </message>
     <message>
         <source>Monaco</source>
-        <translation type="unfinished"></translation>
+        <translation>Monako</translation>
     </message>
     <message>
         <source>Mongolia</source>
-        <translation type="unfinished"></translation>
+        <translation>Mongolia</translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation type="unfinished"></translation>
+        <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
-        <translation type="unfinished"></translation>
+        <translation>Maroko</translation>
     </message>
     <message>
         <source>Mozambique</source>
-        <translation type="unfinished"></translation>
+        <translation>Mozambik</translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
-        <translation type="unfinished"></translation>
+        <translation>Namibia</translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation type="unfinished"></translation>
+        <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
-        <translation type="unfinished"></translation>
+        <translation>Holandia</translation>
     </message>
     <message>
         <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa Kaledonia</translation>
     </message>
     <message>
         <source>New Zealand</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa Zelandia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
+        <translation>Nikaragua</translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation type="unfinished"></translation>
+        <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
-        <translation type="unfinished"></translation>
+        <translation>Nigeria</translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation type="unfinished"></translation>
+        <translation>Niue</translation>
     </message>
     <message>
         <source>Norway</source>
-        <translation type="unfinished"></translation>
+        <translation>Norwegia</translation>
     </message>
     <message>
         <source>Oman</source>
-        <translation type="unfinished"></translation>
+        <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakistan</translation>
     </message>
     <message>
         <source>Palau</source>
-        <translation type="unfinished"></translation>
+        <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
-        <translation type="unfinished"></translation>
+        <translation>Panama</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Papua Nowa Gwinea</translation>
     </message>
     <message>
         <source>Paraguay</source>
-        <translation type="unfinished"></translation>
+        <translation>Paragwaj</translation>
     </message>
     <message>
         <source>Peru</source>
-        <translation type="unfinished"></translation>
+        <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
-        <translation type="unfinished"></translation>
+        <translation>Filipiny</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polska</translation>
     </message>
     <message>
         <source>Portugal</source>
-        <translation type="unfinished"></translation>
+        <translation>Portugalia</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
+        <translation>Purto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation type="unfinished"></translation>
+        <translation>Katar</translation>
     </message>
     <message>
         <source>Reunion</source>
-        <translation type="unfinished"></translation>
+        <translation>Reunion</translation>
     </message>
     <message>
         <source>Romania</source>
-        <translation type="unfinished"></translation>
+        <translation>Rumunia</translation>
     </message>
     <message>
         <source>Russia</source>
-        <translation type="unfinished"></translation>
+        <translation>Rosja</translation>
     </message>
     <message>
         <source>Rwanda</source>
-        <translation type="unfinished"></translation>
+        <translation>Rwanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
+        <translation>Saint Lucia</translation>
     </message>
     <message>
         <source>Samoa</source>
-        <translation type="unfinished"></translation>
+        <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
-        <translation type="unfinished"></translation>
+        <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
+        <translation>Arabia Saudyjska</translation>
     </message>
     <message>
         <source>Senegal</source>
-        <translation type="unfinished"></translation>
+        <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
-        <translation type="unfinished"></translation>
+        <translation>Seszele</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
+        <translation>Sierra Leone</translation>
     </message>
     <message>
         <source>Singapore</source>
-        <translation type="unfinished"></translation>
+        <translation>Singapur</translation>
     </message>
     <message>
         <source>Slovakia</source>
-        <translation type="unfinished"></translation>
+        <translation>Slowacja</translation>
     </message>
     <message>
         <source>Slovenia</source>
-        <translation type="unfinished"></translation>
+        <translation>Slowenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyspy Salomona</translation>
     </message>
     <message>
         <source>Somalia</source>
-        <translation type="unfinished"></translation>
+        <translation>Somalia</translation>
     </message>
     <message>
         <source>South Africa</source>
-        <translation type="unfinished"></translation>
+        <translation>Afryka Poludniowa</translation>
     </message>
     <message>
         <source>Spain</source>
-        <translation type="unfinished"></translation>
+        <translation>Hiszpania</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
+        <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
-        <translation type="unfinished"></translation>
+        <translation>Sw. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
-        <translation type="unfinished"></translation>
+        <translation>Sudan</translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation type="unfinished"></translation>
+        <translation>Surinam</translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation type="unfinished"></translation>
+        <translation>Suazi</translation>
     </message>
     <message>
         <source>Sweden</source>
-        <translation type="unfinished"></translation>
+        <translation>Szwecja</translation>
     </message>
     <message>
         <source>Switzerland</source>
-        <translation type="unfinished"></translation>
+        <translation>Szwajcaria</translation>
     </message>
     <message>
         <source>Taiwan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tajwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tadzykistan</translation>
     </message>
     <message>
         <source>Tanzania</source>
-        <translation type="unfinished"></translation>
+        <translation>Tanzania</translation>
     </message>
     <message>
         <source>Thailand</source>
-        <translation type="unfinished"></translation>
+        <translation>Tajlandia</translation>
     </message>
     <message>
         <source>Togo</source>
-        <translation type="unfinished"></translation>
+        <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation type="unfinished"></translation>
+        <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunezja</translation>
     </message>
     <message>
         <source>Turkey</source>
-        <translation type="unfinished"></translation>
+        <translation>Turcja</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Turkmenistan</translation>
     </message>
     <message>
         <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
+        <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
-        <translation type="unfinished"></translation>
+        <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukraina</translation>
     </message>
     <message>
         <source>Uruguay</source>
-        <translation type="unfinished"></translation>
+        <translation>Urugwaj</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzbekistan</translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
-        <translation type="unfinished"></translation>
+        <translation>Wenezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyspy Dziewicze</translation>
     </message>
     <message>
         <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
+        <translation>Zachodnia Sahara</translation>
     </message>
     <message>
         <source>Yemen</source>
-        <translation type="unfinished"></translation>
+        <translation>Jemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
+        <translation>Jugoslawia</translation>
     </message>
     <message>
         <source>Zambia</source>
-        <translation type="unfinished"></translation>
+        <translation>Zambia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
+        <translation>Zimbabwe</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mezczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Wprowadz notatke</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation type="unfinished"></translation>
+        <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation type="unfinished"></translation>
+        <translation>Rocznica</translation>
     </message>
     <message>
         <source>Kuwait</source>
-        <translation type="unfinished"></translation>
+        <translation>Kuwejt</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Usun</translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Afghanistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Afganistan</translation>
     </message>
     <message>
         <source>Antarctica</source>
-        <translation type="unfinished"></translation>
+        <translation>Antarktyka</translation>
     </message>
     <message>
         <source>Armenia</source>
-        <translation type="unfinished"></translation>
+        <translation>Armenia</translation>
     </message>
     <message>
         <source>Bolivia</source>
-        <translation type="unfinished"></translation>
+        <translation>Boliwia</translation>
     </message>
     <message>
         <source>Cameroon</source>
-        <translation type="unfinished"></translation>
+        <translation>Kamerun</translation>
     </message>
     <message>
         <source>Ghana</source>
-        <translation type="unfinished"></translation>
+        <translation>Ghana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
-        <translation type="unfinished"></translation>
+        <translation>Gwadelupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
-        <translation type="unfinished"></translation>
+        <translation>Gwinea-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
-        <translation type="unfinished"></translation>
+        <translation>Jamajka</translation>
     </message>
     <message>
         <source>Kiribati</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Kirgistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Autonomia Palestynska</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
-        <translation type="unfinished"></translation>
+        <translation>Wietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisnij by wprowadzc imiona i nazwisko</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz swoje dane dokladnie! Jesli masz wieloczlonowe nazwisko (np. &quot;Van Helsing&quot;), wprowadz &lt;nazwisko&gt;,&lt;imiona&gt; w ten sposob: &quot;Van Helsing, Abraham&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
-        <translation type="unfinished"></translation>
+        <translation>Stanowisko..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
-        <translation type="unfinished"></translation>
+        <translation>Na przyklad &quot;jr&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
-        <translation type="unfinished"></translation>
+        <translation>Miejsce pracy z wizytowki</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisnij by wybrac atrybut do zmiany</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisnij by wybrac sposob zapisania nazwiska (i jego prezentacji na liscie)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Sluzbowa komorka</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation type="unfinished">Domyslny e-mail</translation>
+        <translation>Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation type="unfinished">E-maile</translation>
+        <translation>Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefon domowy</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Prywatna komorka</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawod</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation type="unfinished"></translation>
+        <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Kierownik</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation type="unfinished"></translation>
+        <translation>Wspolmalzonek</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation type="unfinished">Plec</translation>
+        <translation>Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation type="unfinished"></translation>
+        <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation type="unfinished"></translation>
+        <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Przydomek</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzieci</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished">Tytul</translation>
+        <translation>Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation type="unfinished">Imie</translation>
+        <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation type="unfinished">Drugie imie</translation>
+        <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation type="unfinished">Nazwisko</translation>
+        <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation type="unfinished">Tytul</translation>
+        <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation type="unfinished">Jako</translation>
+        <translation>Pokazuj jako</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation type="unfinished">Temat pracy</translation>
+        <translation>Stanowisko</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation type="unfinished"></translation>
+        <translation>Wydzial</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation type="unfinished">Firma</translation>
+        <translation>Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - ulica</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - miasto</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - region</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - kod pocztowy</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - kraj</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - strona WWW</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - ulica</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - miasto</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - region</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - kraj</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Strona domowa</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished">Notatka</translation>
+        <translation>Notatki</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index ee084a6..6e51c54 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -1,304 +1,357 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
+        <translation>AdvancedFm</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuj ukryte pliki</translation>
     </message>
     <message>
         <source>Make Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Utworz folder</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien nazwe</translation>
     </message>
     <message>
         <source>Run Command</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykonaj polecenie</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykonaj polecenie z wyswietleniem wyniku</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Przelacz na lokalne</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">przelacz na zdalne</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Notatka</translation>
     </message>
     <message>
         <source>Could not rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna zmienic nazwy</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>Folder nie istnieje</translation>
     </message>
     <message>
         <source>Copy As</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj jako</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiazka Ir wyemitowana.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien folder</translation>
     </message>
     <message>
         <source>Execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykonaj</translation>
     </message>
     <message>
         <source>Open as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz jako tekst</translation>
     </message>
     <message>
         <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
+        <translation>Utworz dowiazanie</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Move</source>
-        <translation type="unfinished"></translation>
+        <translation>Przenies</translation>
     </message>
     <message>
         <source>File Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o pliku</translation>
     </message>
     <message>
         <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlasciwosci</translation>
     </message>
     <message>
         <source>Beam File</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj plik</translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kopiuj</translation>
     </message>
     <message>
         <source> As</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Jako</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj ten sam folder</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna skopiowac
+</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation type="unfinished"></translation>
+        <translation>do</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna przeniesc</translation>
     </message>
     <message>
         <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj do Dokumentow</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Akcje</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz wszystko</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno usunac 
+%1 plikow?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
+        <translation>Usunac folder?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno skopiowac
+%1 plikow?</translation>
     </message>
     <message>
         <source>File Exists!</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik istnieje!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>
+istnieje. Czy nadpisac?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
+        <translation>juz istnieje.
+Czy na pewno chcesz go usunac?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 istnieje. Czy nadpisac?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna skopiowac %1 do %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation>Dodaj folder do zakladek</translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation>Usun aktualny folder z zakladek</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Blad</translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
-        <translation type="unfinished"></translation>
+It is not bookmarked!</source>
+        <translation>Nie mozna usunac aktualnego folderu
+z zakladek.
+Nie ma go w zakladkach!</translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
-        <translation type="unfinished"></translation>
+        <source>File Search</source>
+        <translation>Szukaj pliku</translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Czy na pewno usunac %1
+wraz z zawartoscia?</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete
+%1?</source>
+        <translation>Czy na pewno usunac
+%1?</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wyjscie do pliku (tylko nazwa)</translation>
     </message>
     <message>
         <source>Output</source>
+        <translation>Wyjscie</translation>
+    </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw uprawnienia pliku</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw uprawnienia pliku dla:</translation>
     </message>
     <message>
         <source>owner</source>
-        <translation type="unfinished"></translation>
+        <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
-        <translation type="unfinished"></translation>
+        <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
-        <translation type="unfinished"></translation>
+        <translation>pozostali</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
-        <translation type="unfinished"></translation>
+        <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
-        <translation type="unfinished"></translation>
+        <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
+        <translation>wykonywanie</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 1aa9690..1a073fd 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -1,270 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia...</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation type="unfinished">Aktualny schemat</translation>
+        <translation>Aktualny schemat</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Usun</translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Zapisz</translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymuszaj styl dla wszystkich aplikacji.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz styl dla aplikacji (mozna uzywac znaku specjalnego &lt;b&gt;*&lt;/b&gt;):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik(i) binarny(e)</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl zakladek:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki z ikonami</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista rozwijana</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista rozwijana z ikonami</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Gora</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Dol</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Styl</translation>
+        <translation>Styl</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Kolory</translation>
+        <translation>Kolory</translation>
     </message>
     <message>
         <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaawansowane</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation>Restart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz teraz zrestartowac %1?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished">Tak</translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz schemat</translation>
     </message>
     <message>
         <source>Save scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz schemat</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schemat juz istnieje.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation type="unfinished">Usun schemat</translation>
+        <translation>Usun schemat</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation type="unfinished">Nie mozna usunac aktualnego schematu.</translation>
+        <translation>Nie mozna usunac aktualnego schematu.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nowy&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
+        <translation>Style okreslaja wyglad elementow takich jak przyciski i listwy przewijania w aplikacjach.
+
+Kliknij tu aby wybrac dostepny styl.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby skonfigurowac wybrany styl.
+
+Uwaga: Ta opcja jest niedostepna dla niektorych stylow.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dekoracje okien okreslaja wyglad listwy tytulowej aplikacji i wyglad przyciskow na tej listwie.
+
+Kliknij tu aby wybrac dostepna dekoracje.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz nazwe, styl i rozmiar domyslnej czcionki dla aplikacji.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schematy barw sa zestawem kolorow uzywanych w roznych wyswietlanych elementach.
+
+Kliknij tu aby wybrac dostepny schemat.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zmienic kolory w aktualnym schemacie barw.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby usunac schemat barw wybrany na liscie po lewej stronie.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby nazwac i zapisac aktualny schemat barw.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zezwolic wszystkim aplikacjom na uzywanie globalnych ustawien wygladu.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jesli niektore aplikacje nie wyswietlaja sie prawidlowo z globalnymi ustawieniami wygladu, pewne funkcje moga byc dla nich  wylaczone.
+
+Ten obszar pozwala ci na wybor aplikacji i opcji, ktore chcesz wylaczyc.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby dodac aplikacje do powyzszej listy.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby usunac aktualnie wybrana aplikacje.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij to aby przesunac wybrana aplikacje w gore listy.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij to aby przesunac wybrana aplikacje w dol listy.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac styl dla okien dialogowych z zakladkami (takich jak ta aplikacja). Dostepne style to:
+
+1. Zakladki - normalne zakladki jedynie z tekstem
+2. Zakladki z ikonami - zakladki z ikonami, etykieta tekstowa pojawia sie jedynie na aktualnej zakladce
+3. Lista rozwijana - pionowa lista zakladek
+4. Lista rozwijana z ikonami - pionowa lista zakladek z ikonami</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zakladki pojawialy sie na gorze okna.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zakladki pojawialy sie na dole okna.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest okno podgladu. Mozesz tu zobaczyc jak zmienia sie wyglad wraz ze zmianami opcji.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia wygladu</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kierunek rotacji:</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Edytuj schemat</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by wybrac kolor dla:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
-        <translation type="unfinished"></translation>
+        <translation>Przyklad</translation>
     </message>
     <message>
         <source>Normal Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalna pozycja</translation>
     </message>
     <message>
         <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieaktywna pozycja</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalny tekst</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Podswietlony tekst</translation>
     </message>
     <message>
         <source>Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Przykladowe okno dla wybranych ustawien.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/appskey.ts b/i18n/pl/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/pl/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index 348cc10..76dfbf6 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -1,546 +1,684 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtr kategorii</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz jedna lub wiecej grup</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
+        <translation>Czytam konfiguracje...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anuluj</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Usun
+</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Instaluj</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Przeinstaluj)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Aktualizuj)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Cel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostepna przestrzen</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyjscie</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Przerwij</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Uzytkownik wcisnal PRZERWIJ ***</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Proces przerwany ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz wyjscie</translation>
     </message>
     <message>
         <source>Unknown</source>
+        <translation>Nieznany</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymus zaleznosci</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymus reinstalacje</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymus usuniecie</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymus nadpisanie</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Poziom informacji</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Tylko bledy</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalne wiadomosci</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomosci informujace</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
+        <translation>Komunikaty problemow</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>AQPkg - Manager Pakietow</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu tekst do wyszukania.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by ukryc listwe Quick Jump.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj liste</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby aktualizowac liste pakietow z serwera.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby aktualizowac wszystkie zainstalowane pakiety, jasli dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Sciagaj</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby sciagnac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastosuj zmiany</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby instalowac, usunac lub aktualizowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Akcje</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz pakiety nie zainstalowane</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic dostepne pakiety, ktore nie zostaly zainstalowane.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz zaktualizowane pakiety</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic zainstalowane na tym urzadzeniu pakiety, dla ktorych dostepne sa nowsze wersje.</translation>
     </message>
     <message>
         <source>Filter by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtruj po kategorii</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyswietlic pakiety nalezace do jednej kategorii.</translation>
     </message>
     <message>
         <source>Set filter category</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw kategorie filtrowania</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zmienic kategorie pakietow w uzywanym filtrze.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukaj</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyszukac tekst w nazwach pakietow.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby znalezc nastepna nazwe pakietu zawierajaca szukany tekst.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
+        <translation>Klawiatura Quick Jump</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby pokazac/ukryc klawiature pozwalajaca na szybkie przegladanie listy pakietow.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby skonfigurowac ta aplikacje.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby ukryc pasek wyszukiwania.</translation>
     </message>
     <message>
         <source>Servers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwery:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac zrodlo pakietow (feed).</translation>
     </message>
     <message>
         <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakiety</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich pakietow dostepnych z wybanego powyzej zrodla (feed).
+
+Niebieska kropka obok nazwy pakietu oznacza, ze jest on aktualnie zainstalowany.
+
+Niebieska kropka z gwiazdka oznacza, ze na serwerze jest dostepna nowsza wersja pakietu.
+
+Kliknij w okienko po lewej aby wybrac pakiet.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby odinstalowac aktualnie wybrane pakiety.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Buduje liste serwerow:
+<byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Buduje liste pakietow dla:
+<byte value="x9"/>%1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Odswiezam liste pakietow serwera</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>OSTRZEZENIE: Aktualizacja w czasie
+gdy dziala Opie/Qtopia
+jest NIEZALECANE!
+
+Czy jestes pewien?</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzezenie</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuje zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy jestes pewien, ze chcesz usunac
+%1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy jestes pewien?</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation type="unfinished"></translation>
+        <translation>Gdzie sciagac</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz sciezke do ktorej sciagac</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Instaluj Zdalny Pakiet</translation>
     </message>
     <message>
         <source>Enter package location</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz lokalizacje pakietu</translation>
     </message>
     <message>
         <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
+        <translation>Nic do roboty</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak wybranych pakietow</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz usunac lub przeinstalowac
+%1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun lub Przeinstaluj</translation>
     </message>
     <message>
         <source>ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
+        <translation>Przeinstaluj</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz usunac lub aktualizowac
+%1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun lub Aktualizuj</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuje Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Opis&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Zainstalowany&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Rozmiar&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Wybor&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Nazwa pliku&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Zainstalowana wersja&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Dostepna wersja&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o pakiecie</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o pakiecie niedostepne</translation>
     </message>
     <message>
         <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Usun</translation>
+    </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwery</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation>Cele</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer aktywny</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Cel</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation>Linkuj do root&apos;a</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlaczone</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa uzytkownika:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Haslo:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/backgammon.ts b/i18n/pl/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/pl/backgammon.ts
+++ b/i18n/pl/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/backup.ts b/i18n/pl/backup.ts
index 02b6cc2..1d04af7 100644
--- a/i18n/pl/backup.ts
+++ b/i18n/pl/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup and Restore... pracuje...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
+        <translation>Backup and Restore</translation>
+    </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup and Restore</translation>
     </message>
     <message>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie kopii</translation>
     </message>
     <message>
         <source>Applications</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplikacje</translation>
     </message>
     <message>
         <source>Save To</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz do</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tworz kopie</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Odzyskiwanie</translation>
     </message>
     <message>
         <source>Select Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz zrodlo</translation>
     </message>
     <message>
         <source>Column 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolumna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
+        <translation>&amp;Odzyskuj</translation>
+    </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/bounce.ts b/i18n/pl/bounce.ts
index 9d2d3d1..9baa618 100644
--- a/i18n/pl/bounce.ts
+++ b/i18n/pl/bounce.ts
@@ -1,100 +1,122 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowa gra</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pauzuj gre</translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;O...</translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gra</translation>
     </message>
     <message>
         <source>Score: 00</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkty: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
+        <translation>Zycia: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
+        <translation>Wypelnione: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkty: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
-        <translation type="unfinished"></translation>
+        <translation>Gra zatrzymana.
+Wcisnij P aby kontynuowac!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec Gry!
+Punkty: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zycia: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
+        <translation>Wypelnione: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
+        <translation>Wypelnione: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 punktow: 15 punktow na zycie
+</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 punktow: Bonus
+</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 punktow: Wszystkie punkty
+</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
+        <translation>Na poziom %1.
+Tym razem otrzymujesz %2 zyc!</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/buttonsettings.ts b/i18n/pl/buttonsettings.ts
index 6c13a5b..9e19925 100644
--- a/i18n/pl/buttonsettings.ts
+++ b/i18n/pl/buttonsettings.ts
@@ -1,112 +1,112 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ButtonSettings</name>
     <message>
         <source>Button Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia przyciskow</translation>
     </message>
     <message>
         <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;Wcisnij lub przytrzymaj wcisniety przycisk ktory chcesz przestawic.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Press:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisniety:</translation>
     </message>
     <message>
         <source>Hold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Przytrzymany:</translation>
     </message>
     <message>
         <source>Beam VCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj wizytowke (vCard)</translation>
     </message>
     <message>
         <source>Send eMail</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij e-mail</translation>
     </message>
     <message>
         <source>Toggle Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien Menu</translation>
     </message>
     <message>
         <source>Toggle O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien O-Menu</translation>
     </message>
     <message>
         <source>Show Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz Pulpit</translation>
     </message>
     <message>
         <source>Toggle Recording</source>
-        <translation type="unfinished"></translation>
+        <translation>Przelacz nagrywanie</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Zignorowane&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Pokaz &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Dzwon &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Dzwon &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
 </context>
 <context>
     <name>RemapDlg</name>
     <message>
         <source>%1 %2</source>
         <comment>(hold|press) buttoname</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2</translation>
     </message>
     <message>
         <source>Held</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisniety</translation>
     </message>
     <message>
         <source>Pressed</source>
-        <translation type="unfinished"></translation>
+        <translation>Przytrzymany</translation>
     </message>
     <message>
         <source>No mapping</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak ustawien</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Inne</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Akcje</translation>
     </message>
     <message>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz</translation>
     </message>
 </context>
 <context>
     <name>RemapDlgBase</name>
     <message>
         <source>Action</source>
-        <translation type="unfinished"></translation>
+        <translation>Akcja</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomosc</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/buzzword.ts b/i18n/pl/buzzword.ts
index 076f679..9594760 100644
--- a/i18n/pl/buzzword.ts
+++ b/i18n/pl/buzzword.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
-        <translation type="unfinished"></translation>
+        <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowa gra</translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gra</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/calculator.ts b/i18n/pl/calculator.ts
index d0f1bff..b25e304 100644
--- a/i18n/pl/calculator.ts
+++ b/i18n/pl/calculator.ts
@@ -1,136 +1,136 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
         <source>Experimental Calculator</source>
         <translation>Eksperymantalny kalkulator</translation>
     </message>
     <message>
         <source>M+</source>
-        <translation type="unfinished"></translation>
+        <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
-        <translation type="unfinished"></translation>
+        <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
-        <translation type="unfinished"></translation>
+        <translation>MC</translation>
     </message>
     <message>
         <source>CE</source>
-        <translation type="unfinished"></translation>
+        <translation>CE</translation>
     </message>
     <message>
         <source>log</source>
-        <translation type="unfinished"></translation>
+        <translation>log</translation>
     </message>
     <message>
         <source>ln</source>
-        <translation type="unfinished"></translation>
+        <translation>ln</translation>
     </message>
     <message>
         <source>(</source>
-        <translation type="unfinished"></translation>
+        <translation>(</translation>
     </message>
     <message>
         <source>)</source>
-        <translation type="unfinished"></translation>
+        <translation>)</translation>
     </message>
     <message>
         <source>sin</source>
-        <translation type="unfinished"></translation>
+        <translation>sin</translation>
     </message>
     <message>
         <source>cos</source>
-        <translation type="unfinished"></translation>
+        <translation>cos</translation>
     </message>
     <message>
         <source>tan</source>
-        <translation type="unfinished"></translation>
+        <translation>tan</translation>
     </message>
     <message>
         <source>%</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>+/-</source>
-        <translation type="unfinished"></translation>
+        <translation>+/-</translation>
     </message>
     <message>
         <source>3</source>
-        <translation type="unfinished"></translation>
+        <translation>3</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>=</source>
-        <translation type="unfinished"></translation>
+        <translation>=</translation>
     </message>
     <message>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
     <message>
         <source>-</source>
-        <translation type="unfinished"></translation>
+        <translation>-</translation>
     </message>
     <message>
         <source>x</source>
-        <translation type="unfinished"></translation>
+        <translation>x</translation>
     </message>
     <message>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>.</source>
-        <translation type="unfinished"></translation>
+        <translation>.</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>9</source>
-        <translation type="unfinished"></translation>
+        <translation>9</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
         <translation>Kalkulator</translation>
     </message>
     <message>
         <source>Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/calibrate.ts b/i18n/pl/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/pl/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 77b4422..87a0025 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -1,505 +1,524 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Rachunek</translation>
     </message>
     <message>
         <source>New checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy rachunek</translation>
     </message>
     <message>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje</translation>
     </message>
     <message>
         <source>Transactions</source>
-        <translation type="unfinished"></translation>
+        <translation>Transakcje</translation>
     </message>
     <message>
         <source>Charts</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykresy</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz nazwe rachunku.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz typ rachunku.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation type="unfinished"></translation>
+        <translation>Oszczednosci</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
-        <translation type="unfinished"></translation>
+        <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Inne</translation>
     </message>
     <message>
         <source>Bank:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu nazwe banku dla rachunku.</translation>
     </message>
     <message>
         <source>Account number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer konta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu numer konta dla rachunku.</translation>
     </message>
     <message>
         <source>PIN number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu numer PIN dla rachunku.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilans poczatkowy:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu poczatkowy bilans dla rachunku.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu dodatkowe informacje o tym rachunku.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualny bilans: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten obszar pokazuje aktualny bilans tego rachunku.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich transakcji przeprowadzonych na tym rachunku.
+
+By przesortowac wpisy wg pewnego pola, kliknij na nazwe kolumny.</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilosc</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby dodac nowa transakcje.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz transakcje, a nastepnie kliknij tu by ja edytowac.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz rachunek i kliknij tu aby go usunac.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz pozadany wykres ponizej i kliknij na przycisk Rysuj.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyprac typ wykresu.</translation>
     </message>
     <message>
         <source>Account balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilans konta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyplaty wg kateorii</translation>
     </message>
     <message>
         <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Wplaty wg kategorii</translation>
     </message>
     <message>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation>Rysuj</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby rysowac wybrany wykres.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualny bilans: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun transakcje</translation>
     </message>
     <message>
         <source>Password protect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ochrona hasla</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wlaczyc/wylaczyc ochrone tego rachunku haslem.</translation>
     </message>
     <message>
         <source>Num</source>
-        <translation type="unfinished"></translation>
+        <translation>Nr</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz haslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosze wpisac swoje haslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
-        <translation type="unfinished"></translation>
+        <translation>Potwierdz haslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosze potwierdzic swoje haslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosze wpisac swoje haslo aby potwierdzic zniesienie ochrony hasla:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj rachunek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
+        <translation>Podaj symbol waluty:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu wpisz symbol swojej lokalnej waluty.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz czy rachunek jest chroniony
+haslem</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by zdecydowac, czy okno glowne ma pokazywac czy rachunek jest chroniony haslem.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz bilanse rachunkow</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by zdecydowac, czy okno glowne ma pokazywac aktualny bilans kazdego rachunku.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Rachunek</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby stworzyc nowy rachunek.
+
+Mozesz rowniez wybrac Nowy z menu Rachunek.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz rachunek i kliknij tu aby go edytowac.
+
+Mozesz rowniez wybrac Edytuj z menu Rachunek albo kliknac i przytrzymac nazwe rachunku.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz rachunek i kliknij tu aby go usunac.
+
+Mozesz rowniez wybrac Usun z menu Rachunek.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich aktualnie dostepnych rachunkow.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun rachunek</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby skonfigurowac ta aplikcaje.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa rachunku</translation>
     </message>
     <message>
         <source>Balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Bilans</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosze podac swoje haslo:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
-        <translation type="unfinished"></translation>
+        <translation>Transakcja na</translation>
     </message>
     <message>
         <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyplata</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu czy transakcja jest wycofaniem czy depozytem.</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation type="unfinished"></translation>
+        <translation>Wplata</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu wybierz date transakcji.</translation>
     </message>
     <message>
         <source>Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu numer czeku.</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu wpisz opis transakcji.</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu kategorie transakcji.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu wybierz typ transakcji.
+
+Dostepnosc opcji jest uzalezniona od tego, czy transakcja jest depozytem, czy wycofaniem.</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilosc:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu wielkosc transakcji.
+
+Wartosc ta powinna byc zawsze liczba dodatnia.</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prowizja:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz jakiekolwiek oplaty/prowizje zwiazana z ta transakcja.
+
+Wpisana wartosc powinna byc liczba dodatnia.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu dodatkowe informacje o transakcji.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Samochod</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation type="unfinished"></translation>
+        <translation>Rachunki</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation type="unfinished"></translation>
+        <translation>Plyty CD</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Ubrania</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Komputer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation type="unfinished"></translation>
+        <translation>Plyty DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozrywka</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation type="unfinished"></translation>
+        <translation>Jedzenie</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation type="unfinished"></translation>
+        <translation>Bezyna</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozne</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation type="unfinished"></translation>
+        <translation>Filmy</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation type="unfinished"></translation>
+        <translation>Czynsz</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation type="unfinished"></translation>
+        <translation>Podroz</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
+        <translation>Karta platnicza</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Czek</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Karta kredytowa</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation type="unfinished"></translation>
+        <translation>Praca</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation type="unfinished"></translation>
+        <translation>Czlonek rodziny</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozne</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatyczna platnosc</translation>
     </message>
     <message>
         <source>Cash</source>
+        <translation>Gotowka</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/citytime.ts b/i18n/pl/citytime.ts
index dcb79e8..200e47c 100644
--- a/i18n/pl/citytime.ts
+++ b/i18n/pl/citytime.ts
@@ -1,67 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
-        <translation>Czas zmieniony</translation>
+        <translation>Zmieniam czas</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
-        <translation>Jest problem z ustawieniem strony czasowej %1</translation>
+        <translation>Jest problem z ustawieniem strefy czasowej %1</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
-        <translation>Przywracam Strefe Czasowa</translation>
+        <translation>Przywroc Strefe Czasowa</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
         <translation>Jest problem z ustwaieniem twojej strefy czasowej. Twoj czas moze byc bledny...</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
         <translation>Czasy w miastach</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij na jednym z ustawionych miast by je zastapic innym</translation>
     </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
         <translation>Miasto</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
-        <translation>Nie moge znalesc informacji o strefie czasowej</translation>
+        <translation>Nie mozna znalesc informacji o strefie czasowej</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation>&lt;p&gt;Nie moge znalesc zadnej strefy czasowej w %1</translation>
+        <translation>&lt;p&gt;Nie mozna znalesc informacji o strefie czasowej w %1</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna znalezc mapy</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna zaladowac mapy: %1, koncze</translation>
     </message>
     <message>
         <source>Continent</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynent</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz kontynent/kraj, a potem wybierz miasto</translation>
     </message>
     <message>
         <source>City</source>
-        <translation type="unfinished"></translation>
+        <translation>Miasto</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/clock.ts b/i18n/pl/clock.ts
index 5a28d2b..53a4c84 100644
--- a/i18n/pl/clock.ts
+++ b/i18n/pl/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Drzemka</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Zegar</translation>
     </message>
     <message>
         <source>Stopwatch</source>
-        <translation>Zatrzymaj</translation>
+        <translation>Stoper</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Uruchom</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeruj</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Ustaw alarm</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarm jest wlaczony</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarm jest wylaczony</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw date i godzine.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
+        <translation>Zegar: Alarm zostal przegapiony.</translation>
+    </message>
+    <message>
+        <source>Alarm set: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Ustaw alarm</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Godzina</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuta</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation>Opoznienie drzemni
+        <translation>Opoznienie drzemki
 (minuty)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>alarm mp3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/confedit.ts b/i18n/pl/confedit.ts
index a4f440a..e6907ca 100644
--- a/i18n/pl/confedit.ts
+++ b/i18n/pl/confedit.ts
@@ -1,78 +1,78 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>EditWidget</name>
     <message>
         <source>File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa pliku:</translation>
     </message>
     <message>
         <source>Group:</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupa:</translation>
     </message>
     <message>
         <source>Key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Klucz:</translation>
     </message>
     <message>
         <source>Value:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosc:</translation>
     </message>
 </context>
 <context>
     <name>ListViewConfDir</name>
     <message>
         <source>Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Pliki</translation>
     </message>
     <message>
         <source>Could not open</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc</translation>
     </message>
     <message>
         <source>The directory </source>
-        <translation type="unfinished"></translation>
+        <translation>Folder</translation>
     </message>
     <message>
         <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>nie moze byc otworzony.</translation>
     </message>
 </context>
 <context>
     <name>ListViewItemConfFile</name>
     <message>
         <source>Could not open</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc</translation>
     </message>
     <message>
         <source>The file </source>
-        <translation type="unfinished"></translation>
+        <translation>Plik</translation>
     </message>
     <message>
         <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>nie moze byc otworzony.</translation>
     </message>
     <message>
         <source>no group</source>
-        <translation type="unfinished"></translation>
+        <translation>bez grupy</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytor Plikow Konfiguracyjnych</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Revert</source>
-        <translation type="unfinished"></translation>
+        <translation>Odwroc zmiany</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 71b9162..5ef4c55 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -1,810 +1,837 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Dzis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>WeekLst</source>
-        <translation>Tydzien</translation>
+        <translation>Tydzien - lista</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiac</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
-        <translation>Czas zdarzenia jest dluzszy
-niz czestotliwosc powtarzania.</translation>
+        <translation>Czas zdarzenia jest potencjalnie dluzszy
+niz odstep pomiedzy jego powtorzeniami.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie mozna zmieniac danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edytuj zdarzenie</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minut)</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamieci</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kaledarz nie moze
-zapisac zmien.
-Zrob wiecej miejsca w pamieci i sprobuj ponownie.
+zapisac zmian.
+Zwolnij miejsce w pamieci i sprobuj ponownie.
 
 Wyjsc ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
-        <translation>(nieznany)</translation>
+        <translation>(Nieznany)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Blad!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popraw to</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Kontynuowac</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplikuj zdarzenie</translation>
     </message>
     <message>
         <source>Edit...</source>
+        <translation>Edytuj...</translation>
+    </message>
+    <message>
+        <source>error box</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
-        <translation type="unfinished">P</translation>
+        <translation>M</translation>
     </message>
     <message>
         <source>T</source>
-        <translation type="unfinished">W</translation>
+        <translation>T</translation>
     </message>
     <message>
         <source>W</source>
-        <translation type="unfinished">S</translation>
+        <translation>W</translation>
     </message>
     <message>
         <source>F</source>
-        <translation type="unfinished">P</translation>
+        <translation>F</translation>
     </message>
     <message>
         <source>S</source>
-        <translation type="unfinished"></translation>
+        <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedzialek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sroda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piatek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
-        <translation type="unfinished"></translation>
+        <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Poczatek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest zdarzenie calodniowe.</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <source> - </source>
-        <translation type="unfinished"></translation>
+        <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
+        <translation>Duplikuj</translation>
+    </message>
+    <message>
+        <source>Beam this occurence</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
-        <translation type="unfinished"></translation>
+        <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
-        <translation type="unfinished"></translation>
+        <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
-        <translation type="unfinished"></translation>
+        <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished">Kalendarz</translation>
+        <translation>Kalendarz</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Rozpocznij przeglad zdarzen</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Czas startu:</translation>
+        <translation>Czas poczatkowy:</translation>
     </message>
     <message>
         <source>:00</source>
-        <translation type="unfinished"></translation>
+        <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Ustawienia alarmu</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
-        <translation>Reset alarmu</translation>
+        <translation>Ustawienie alarmu</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozne</translation>
     </message>
     <message>
         <source>Row style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl wierszy:</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Srednie</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Duze</translation>
     </message>
     <message>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>Widoki</translation>
     </message>
     <message>
         <source>Default view:</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslny widok:</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Dzien</translation>
+        <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Tydzien</translation>
+        <translation>Tydzien</translation>
     </message>
     <message>
         <source>Week List</source>
-        <translation type="unfinished"></translation>
+        <translation>Tydzien - lista</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Miesiac</translation>
+        <translation>Miesiac</translation>
     </message>
     <message>
         <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
+        <translation>Skocz do &quot;dzisiaj&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyswietlanie czasu</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Brak</translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Poczatek</translation>
+        <translation>Poczatek</translation>
     </message>
     <message>
         <source>Start-End</source>
-        <translation type="unfinished"></translation>
+        <translation>Poczatek-koniec</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">Biuro</translation>
+        <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished">Dom</translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest zdarzenie calodniowe.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
+        <translation>00. Sty-00. Sty</translation>
+    </message>
+</context>
+<context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
+        <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Pn</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Wt</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Sr</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Czw</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Pt</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">So</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ni</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Powtarzaj...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dziennie...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tygodniowo...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Miesiecznie...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Rocznie...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Jednorazowo...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Poczatek</translation>
     </message>
     <message>
         <source>End Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nowe zdarzenie</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Spotkanie</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Obiad</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Kolacja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podroz</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Sty 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Czas startu</translation>
+        <translation>Poczatek</translation>
     </message>
     <message>
         <source>All day</source>
-        <translation>Kazdy dzien</translation>
+        <translation>Caly dzien</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Cicho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glosno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Powtarzaj</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nie powtarzaj</translation>
     </message>
     <message>
         <source>Description </source>
-        <translation type="unfinished"></translation>
+        <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
-        <translation type="unfinished"></translation>
+        <translation>Poczatek - Koniec</translation>
     </message>
     <message>
         <source>Note...</source>
+        <translation>Notatki...</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;1/10&lt;/b&gt; Obiad</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Poczatek</translation>
+        <translation>Poczatek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 kazdy</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 kazdy </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 kazdego</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Kazdy </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedzialek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sroda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piatek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
-        <translation>Nie Powtarzaj</translation>
+        <translation>Jednorazowe</translation>
     </message>
     <message>
         <source>day(s)</source>
-        <translation>dzien</translation>
+        <translation>dzienne</translation>
     </message>
     <message>
         <source>week(s)</source>
-        <translation>tydzien</translation>
+        <translation>tygodniowe</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
-        <translation>miesiac</translation>
+        <translation>miesieczne</translation>
     </message>
     <message>
         <source>year(s)</source>
-        <translation>rok</translation>
+        <translation>roczne</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzien</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tygodnie</translation>
     </message>
     <message>
         <source>week</source>
         <translation>tydzien</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiac</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
         <translation> i </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 i </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, i </translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation>Powtarzajace zdarzenie</translation>
+        <translation>Powtarzajace sie zdarzenie</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Tydzien</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Miesiac</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Kazdego:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Czestotliwosc</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Konic o:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Bez konca</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Powtarzaj o:</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pio</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Kazdego</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>miesiecy</translation>
     </message>
     <message>
         <source>years</source>
         <translation>lat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/drawpad.ts b/i18n/pl/drawpad.ts
index 0087591..8cbf1c6 100644
--- a/i18n/pl/drawpad.ts
+++ b/i18n/pl/drawpad.ts
@@ -1,438 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Usun wszystkie</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importuj</translation>
     </message>
     <message>
         <source>Import...</source>
-        <translation>Import...</translation>
+        <translation>Importuj...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Eksportuj</translation>
     </message>
     <message>
         <source>Export...</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksportuj...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Narzedzia</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nowa strona</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Wyczysc strone</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Usun strone</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Wroc</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Powtorz</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Pierwsza strona</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Wczesniejsza strona</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Nastepna strona</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Ostatnia strona</translation>
     </message>
     <message>
         <source>Draw Point</source>
-        <translation>Rysik</translation>
+        <translation>Rysuj punkt</translation>
     </message>
     <message>
         <source>Draw Line</source>
-        <translation>Linia</translation>
+        <translation>Rysuj linie</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
-        <translation>Prostokaty</translation>
+        <translation>Rysuj prostokat</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
-        <translation>Pudelka</translation>
+        <translation>Rysuj wypelniony prostokat</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
-        <translation>Elipsy</translation>
+        <translation>Rysuj elipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
-        <translation>Wypelnione elipsy</translation>
+        <translation>Rysuj wypelniona elipse</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Wypelnij obszar</translation>
     </message>
     <message>
         <source>Erase Point</source>
-        <translation>Usun punkt</translation>
+        <translation>Wyczysc punkt</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Grubosc rysika</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Kolor rysika</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Kolor wypelnienia</translation>
     </message>
     <message>
         <source>Insert Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw tekst</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o stronie</translation>
     </message>
     <message>
         <source>Page Information...</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o stronie...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
-        <translation type="unfinished">Chcesz wyczyscic
+        <translation>Chcesz wyczyscic
 aktualna strone?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
-        <translation type="unfinished">Chcesz usunac
+        <translation>Chcesz usunac
 aktualna strone?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
-        <translation type="unfinished">Chcesz usunac
+        <translation>Chcesz usunac
 wszystkie strony?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation>Antyaliasing</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby dodac nowa kartke.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyczyscic aktualna kartke.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby usunac aktualna kartke.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by cofnac ostatnia akcje.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby powtorzyc ostatnia akcje.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zobaczyc pierwsza strone.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zobaczyc poprzednia strone.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zobaczyc nastepna strone.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby zobaczyc ostatnia strone.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac jedno z dostepnych narzedzi do rysowania linii.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac jedno z dostepnych narzedzi do rysowania prostokatow.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac jedno z dostepnych narzedzi do rysowania elips.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac narzedzie do wstawiania tekstu.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac narzedzie do wypelniania.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac gumke.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac szerokosc rysika.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac kolor rysika.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac kolor wypelnienia.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Wybor strony</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Aktualna</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Zakres</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Eksportuj jako</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Format:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Wszystkie obrazki</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>Automatyczny podglad</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Podglad</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>Wszystkie obrazki</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nowa strona</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Tlo</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Bialy</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Kolor rysika</translation>
     </message>
     <message>
         <source>Fill Color</source>
-        <translation type="unfinished">Kolor wypelnienia</translation>
+        <translation>Kolor wypelnienia</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogolne</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tytul:</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokosc:</translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysokosc:</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o stronie</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogolne</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tytul:</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data:</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokosc:</translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysokosc:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tytul: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymiary: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Data: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw tekst</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
-        <translation type="unfinished">Wyczysc strone</translation>
+        <translation>Wyczysc strone</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz wyczyscic
+wybrana strone?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Delete Page</source>
-        <translation type="unfinished">Usun strone</translation>
+        <translation>Usun strone</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz usunac
+wybrana strone?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby dodac nowa kartke.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wyczyscic aktualna kartke.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby usunac aktualna kartke.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby przesunac aktualna kartke w gore listy.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby przesunac aktualna kartke w dol listy.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index 1e73799..fb27ae3 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -1,217 +1,237 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
-        <translation>Wybor komenty</translation>
+        <translation>Wybor polecenia</translation>
+    </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">nowe</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="obsolete">edytuj</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">usun</translation>
+    </message>
+    <message>
+        <source>up</source>
+        <translation type="obsolete">gora</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation type="obsolete">dol</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
-        <translation>Komendy</translation>
+        <translation>Polecenia</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation>&lt;B&gt;Komendy&lt;/B&gt;:</translation>
+        <translation>&lt;B&gt;Polecenia&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation>&lt;B&gt;Sugerowane&lt;/B&gt;:</translation>
+        <translation>&lt;B&gt;Sugerowane polecenia&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo male</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Male</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Srednie</translation>
     </message>
     <message>
         <source>Show command list</source>
-        <translation>Wyswietl liste komend</translation>
+        <translation>Wyswietl liste polecen</translation>
     </message>
     <message>
         <source>Hide command list</source>
-        <translation>Ukryj liste komend</translation>
+        <translation>Ukryj liste polecen</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Zakladki na dole</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na bialym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Biale na czarnym</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
-        <translation>Biale na przezroczystym</translation>
+        <translation>Czarne na przezroczystym</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Czarne na czerwonym</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Czerwone na czarnym</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Zielone na zoltym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
-        <translation>Magneta na Niebieskim</translation>
+        <translation>Magneta na niebieskim</translation>
     </message>
     <message>
         <source>Cyan on White</source>
-        <translation>Cyan na bialym</translation>
+        <translation>Cyjan na bialym</translation>
     </message>
     <message>
         <source>White on Cyan</source>
-        <translation>Biale na cyanie</translation>
+        <translation>Biale na cyjan</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
-        <translation>Amber na czarnym</translation>
+        <translation>Bursztyn na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opcje</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadz</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tabulator</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Przewijanie</translation>
     </message>
     <message>
         <source>Show Command List</source>
-        <translation>Wyswietl liste komend</translation>
+        <translation>Wyswietl liste polecen</translation>
     </message>
     <message>
         <source>Hide Command List</source>
-        <translation>Ukryj liste komend</translation>
+        <translation>Ukryj liste polecen</translation>
     </message>
     <message>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdefiniuj</translation>
     </message>
     <message>
         <source>Command List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista polecen</translation>
     </message>
     <message>
         <source>Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawijaj</translation>
     </message>
     <message>
         <source>Use Beep</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj sygnalu</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki na gorze</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
-        <translation>Wybor komendy</translation>
+        <translation>Wybor polecenia</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
-        <translation>Dodaj komende</translation>
+        <translation>Dodaj polecenie</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
-        <translation>Wprowadz komende do dodania:</translation>
+        <translation>Wprowadz polecenie do dodania:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/euroconv.ts b/i18n/pl/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/pl/euroconv.ts
+++ b/i18n/pl/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/fifteen.ts b/i18n/pl/fifteen.ts
index 99c3adc..462fd0e 100644
--- a/i18n/pl/fifteen.ts
+++ b/i18n/pl/fifteen.ts
@@ -1,42 +1,42 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Losuj</translation>
     </message>
     <message>
         <source>Solve</source>
         <translation>Poukladaj</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
 </context>
 <context>
     <name>PiecesTable</name>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
     <message>
         <source>Congratulations!
 You win the game!</source>
         <translation>Gratulacje!
 Wygrales gre!</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
         <translation>P&amp;omieszaj klocki</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
-        <translation>&amp;Reset klocki</translation>
+        <translation>&amp;Resetuj klocki</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/filebrowser.ts b/i18n/pl/filebrowser.ts
deleted file mode 100644
index 72816ab..0000000
--- a/i18n/pl/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Przegladarka plikow</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Katalog</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Sortuj</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>wg Nazwy</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>wg Rozmiaru</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>wg Daty</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>wg Typu</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Malejaco</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Ukryj</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Symlinki</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Widok</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Poprzedni katalog</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Nadrzedny katalog</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nowy folder</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Wytnij</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiuj</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Wklej</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Przegladarka plikow</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>Nie moge wyswietlic katalogu /dev/</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Zmiana nazwy</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Zmiana nazwy nie udala sie!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Wklej plik</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Wklejanie nie udalo sie!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Wytnij plik</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Wycinanie nie udalo sie!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Usun</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Jestes pewnien?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Tak</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Nie</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Usuwanie nie udalo sie!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nowy folder</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Tworzenie katalogu nie udalo sie!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Wywolaj Aplikacje</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Wywolanie nie powiodlo sie!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Dodaj do dokumentow</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Uruchom</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Wyswietl jako tekst</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Zmien nazwe</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Wytnij</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiuj</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Wklej</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Zmien uprawnienia</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Zaznacz wszystko</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Odznacz wszystko</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Zmien uprawnienia</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Ustaw uprawnienia</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Ustaw uprawnienia dla:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>wlasciciel</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>grupa</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>inni</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Wlasciciel</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Grupa</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>odczyt</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>zapis</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>uruchamianie</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/formatter.ts b/i18n/pl/formatter.ts
index 751e732..1cfe32c 100644
--- a/i18n/pl/formatter.ts
+++ b/i18n/pl/formatter.ts
@@ -1,161 +1,212 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
-        <translation type="unfinished"></translation>
+        <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ pamieci</translation>
     </message>
     <message>
         <source>File Systems</source>
-        <translation type="unfinished"></translation>
+        <translation>Systemy plikow</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="unfinished"></translation>
+        <translation>Glowny</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">UWAGA:
+Zmiana parametrow na tej
+stronie moze zaklocic prawidlowe
+dzialanie twojego systemu!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprawdz dysk</translation>
     </message>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie</translation>
     </message>
     <message>
         <source>Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkt montowania</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaawansowane</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Formatowac?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Na pewno formatowac
+</translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">
+na</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">system plikow?!?
+Stracisz wszystkie dane!!</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna zformatowac.
+Nieznany typ</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane wyjsciowe Formatera</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
+        <translation>Probuje odmontowac.</translation>
     </message>
     <message>
         <source>umount failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>odmontowanie sie nie powiodlo!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna odmontowac. Urzadzenie jest uzywane!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Probuje formatowac.</translation>
     </message>
     <message>
         <source>No such device!</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak takiego urzadzenia!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
+        <translation>
+zostal zformatowany.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Probuje zamontowac.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamontowanie karty nie powiodlo sie!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">
+zostal zamontowany.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Mozesz zamknac okno z wynikami.</translation>
     </message>
     <message>
         <source>Internal</source>
-        <translation type="unfinished"></translation>
+        <translation>Wewnetrzny</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Typ pamieci:</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Calosc: %1 kB ( %d mB)
+</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Zajete: %1 kB ( %d mB)
+</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
+        <translation>Dostepne: %1 kB ( %d mB)</translation>
+    </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/go.ts b/i18n/pl/go.ts
index f69efe3..3c8fab0 100644
--- a/i18n/pl/go.ts
+++ b/i18n/pl/go.ts
@@ -1,56 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GoMainWidget</name>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <message>
         <source>Pass</source>
-        <translation type="unfinished"></translation>
+        <translation>Pas</translation>
     </message>
     <message>
         <source>Resign</source>
-        <translation type="unfinished"></translation>
+        <translation>Rezygnuj</translation>
     </message>
     <message>
         <source>Two player option</source>
-        <translation>Opcje dla 2 graczy</translation>
+        <translation>Opcja dla 2 graczy</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Biale %1, Czarne %2.</translation>
     </message>
     <message>
         <source>White wins.</source>
         <translation>Biale wygraly.</translation>
     </message>
     <message>
         <source>Black wins.</source>
         <translation>Czarne wygraly.</translation>
     </message>
     <message>
         <source>A draw.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I pass</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasuje</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Wiezniowie: czarni %1, biali %2</translation>
     </message>
     <message>
         <source>Go</source>
         <translation>Go</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/helpbrowser.ts b/i18n/pl/helpbrowser.ts
index 2f8b5a7..2c48923 100644
--- a/i18n/pl/helpbrowser.ts
+++ b/i18n/pl/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Wstecz</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Naprzod</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation>Dom</translation>
+        <translation>Poczatek</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj do ulubionych</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Usun z ulubionych</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Ulubione</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>Pomoc</translation>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/kbill.ts b/i18n/pl/kbill.ts
index f4d45dd..1f17284 100644
--- a/i18n/pl/kbill.ts
+++ b/i18n/pl/kbill.ts
@@ -1,64 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
-        <translation type="unfinished"></translation>
+        <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa gra</translation>
     </message>
     <message>
         <source>Pause game</source>
-        <translation type="unfinished"></translation>
+        <translation>Pauzuj gre</translation>
     </message>
     <message>
         <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
+        <translation>Historia kBill&apos;a</translation>
     </message>
     <message>
         <source>Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Zasady</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pomoc</translation>
     </message>
     <message>
         <source>Pause Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Pauzuj Gre</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
+        <translation>Historia KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
+        <translation>Zasady KBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Po Poziomie</translation>
     </message>
     <message>
         <source>Your score</source>
-        <translation type="unfinished"></translation>
+        <translation>Twoje punkty</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/kcheckers.ts b/i18n/pl/kcheckers.ts
index d11d388..93e10f5 100644
--- a/i18n/pl/kcheckers.ts
+++ b/i18n/pl/kcheckers.ts
@@ -1,129 +1,129 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KCheckers</name>
     <message>
         <source>What&apos;s This</source>
         <translation>Co to jest</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
     </message>
     <message>
         <source>Go!</source>
-        <translation type="unfinished"></translation>
+        <translation>Start!</translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
         <translation>Gratulacje! Wygrales!</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Prosze czekac...</translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
         <translation>Przegrales. Koniec gry</translation>
     </message>
     <message>
         <source>Incorrect course.</source>
         <translation>Bledny ruch</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowa</translation>
     </message>
     <message>
         <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cofnij ruch</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Koniec</translation>
     </message>
     <message>
         <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Poczatkujacy</translation>
     </message>
     <message>
         <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowicjusz</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sredni</translation>
     </message>
     <message>
         <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dobry</translation>
     </message>
     <message>
         <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ekspert</translation>
     </message>
     <message>
         <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mistrz</translation>
     </message>
     <message>
         <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pokaz numeracje</translation>
     </message>
     <message>
         <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Zasady &amp;angielskie</translation>
     </message>
     <message>
         <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Zasady &amp;rosyjskie</translation>
     </message>
     <message>
         <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zielona szachownica</translation>
     </message>
     <message>
         <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Marmurowa szachownica</translation>
     </message>
     <message>
         <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Drewniana szachownica</translation>
     </message>
     <message>
         <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reguly gry</translation>
     </message>
     <message>
         <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;O KCheckers</translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gra</translation>
     </message>
     <message>
         <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Trudnosc</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opcje</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pomoc</translation>
     </message>
     <message>
         <source> New Game </source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa gra</translation>
     </message>
     <message>
         <source> Undo Move </source>
-        <translation type="unfinished"></translation>
+        <translation>Cofnij ruch</translation>
     </message>
     <message>
         <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
+        <translation>Reguly gry</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/keypebble.ts b/i18n/pl/keypebble.ts
index 0a39aad..7ed2803 100644
--- a/i18n/pl/keypebble.ts
+++ b/i18n/pl/keypebble.ts
@@ -1,288 +1,292 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Polaczony</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Polaczenie odrzucone</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Nie znaleziono serwera</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad odczytu: QSocket zglosil blad przy czytaniu
+danych, prawdopodobnie zdalny host porzucil
+polaczenie.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
+        <translation>QSocket zglosil nieprawidlowy kod bledu</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
         <translation>Oczekiwanie na inicjalizacje serwera...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Oczekiwanie na nazwe pulpitu...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Polaczony do %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad protokolu: Serwer %1 uzyl nieznanego kodowania</translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
         <translation>Oczekiwanie na wersje serwera...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad: Niewlasciwa wersja serwera, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad: Nieobslugiwana wersja serwera, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
         <translation>Zalogowany</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Blad: Serwer zazadal hasla, ale zadne nie zostalo podane.
+</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad: Podane haslo jest nieprawidlowe.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad: Zbyt wiele nieudanych prob logowania na to konto,
+sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Login Failed</source>
         <translation>Blad logowania</translation>
     </message>
     <message>
         <source>Too many failures</source>
         <translation>Zbyt duzo bledow</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
         <translation>Klient VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Caly ekran</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Rozlaczono</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
         <translation>Do okna</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
         <translation>Polaczono do zdalnego serwera</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
         <translation>Zalogowano na zdalnym serwerze</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>Polaczenie zamkniete</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe polaczenie</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz zakladke</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun zakladke</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij Contrl-Alt-Delete</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Natepne klikniecie to podwojne klikniecie</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastepne klikniecie to prawy przycisk</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz zakladke, ktora chcesz otworzyc</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie z VNC Viewer</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer</translation>
     </message>
     <message>
         <source>Show Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz haslo</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished">Haslo:</translation>
+        <translation>Haslo:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa zakladki:</translation>
     </message>
     <message>
         <source>Host Name:</source>
-        <translation type="unfinished">Nazwa serwera:</translation>
+        <translation>Nazwa komputera:</translation>
     </message>
     <message>
         <source>Display Number:</source>
-        <translation type="unfinished">Numer pulpitu:</translation>
+        <translation>Numer pulpitu:</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation type="unfinished">Sprawdz zmiany na pulpicie co:</translation>
+        <translation>Sprawdz zmiany na pulpicie co:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation type="unfinished">Milisekund</translation>
+        <translation>Milisekund</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation type="unfinished">Zarzadaj 8-bit sesji</translation>
+        <translation>Zazadaj 8-bit sesji</translation>
     </message>
     <message>
         <source>Raise on bell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation type="unfinished">Zarzadaj wspoldzielonej sesji</translation>
+        <translation>Zarzadaj wspoldzielonej sesji</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encodings</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodowania</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodowanie Hextile</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodowanie CoRRE</translation>
     </message>
     <message>
         <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kodowanie RRE</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Haslo serwera VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa serwera VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa komputera serwera VNC</translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer pulpitu serwera VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Zezwalaj innym uzytkownikom na polaczenia do serwera VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
+        <translation>Skaluj zdalny pulpit do ekranu PDA (wolne)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/kpacman.ts b/i18n/pl/kpacman.ts
index fb73268..ca93483 100644
--- a/i18n/pl/kpacman.ts
+++ b/i18n/pl/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien przyciski kierunkow</translation>
     </message>
     <message>
         <source>Undefined key</source>
-        <translation type="unfinished"></translation>
+        <translation>Niezdefiniowany przycisk</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowa</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pauza</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sala slawy</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Koniec</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ukryj kursor</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wybierz schemat grafiki</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Pauzuj w &amp;tle</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynuuj na &amp;pierwszym planie</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zmien przyciski...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pomoc</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
+        <translation>KONIEC GRY</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
+        <translation>GRACZ 1</translation>
     </message>
     <message>
         <source>READY!</source>
-        <translation type="unfinished"></translation>
+        <translation>SZYKUJ SIE!</translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PAUZA</translation>
     </message>
     <message>
         <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
+        <translation>POSTAC</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
+        <translation>KSYWKA</translation>
     </message>
     <message>
         <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
+        <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
+        <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
+        <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
-        <translation type="unfinished"></translation>
+        <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
+        <translation>WCISNIJ KURSOR BY ZACZAC</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
+        <translation>    GRATULACJE</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
+        <translation>   OSIAGNOLES</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
+        <translation>PUNKTACJA W PIERWSZEJ 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PAUZA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad inicjalizacji</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/language.ts b/i18n/pl/language.ts
index 3ddd2bc..e7dc76a 100644
--- a/i18n/pl/language.ts
+++ b/i18n/pl/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
-        <translation type="unfinished"></translation>
+        <translation>Angielski</translation>
     </message>
     <message>
         <source>default</source>
-        <translation type="unfinished"></translation>
+        <translation>domyslny</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
         <translation>Wybierz jezyk</translation>
     </message>
     <message>
         <source>Language Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia jezyka</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/launchersettings.ts b/i18n/pl/launchersettings.ts
index d6ee0ff..d463456 100644
--- a/i18n/pl/launchersettings.ts
+++ b/i18n/pl/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia Launcher&apos;a</translation>
     </message>
     <message>
         <source>Taskbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasek zadan</translation>
     </message>
     <message>
         <source>O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
-        <translation type="unfinished"></translation>
+        <translation>W O-Menu laduj applety:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>W O-Menu pokazuj zakladki Launcher&apos;a</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz applety, ktore maja byc umieszczone w O-Menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaje zawartosc zakladek Launcher&apos;a jako menu w O-Menu.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Przyklad 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Przyklad 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Przyklad 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj zakladke</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlo</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka</translation>
     </message>
     <message>
         <source>Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikony</translation>
     </message>
     <message>
         <source>Previewing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Podglad %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
-        <translation type="unfinished"></translation>
+        <translation>To ogolny podglad tego jak bedzie wygladac aktualnie wybrana zakladka.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzyj wlasnej czcionki</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <source>Ruled</source>
-        <translation type="unfinished"></translation>
+        <translation>Paski</translation>
     </message>
     <message>
         <source>Solid color</source>
-        <translation type="unfinished"></translation>
+        <translation>Jednolity kolor</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Tapeta</translation>
     </message>
     <message>
         <source>Select...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz...</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar:</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Male</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Duze</translation>
     </message>
     <message>
         <source>Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kolor:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki Launcher&apos;a:</translation>
     </message>
     <message>
         <source>foobar</source>
-        <translation type="unfinished"></translation>
+        <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz duzy wskaznik zajetosci</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz migajacy wskaznik zajetosci</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz zakladke, ktora chcesz edytowac lub usunac.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaje nowa zakladke do Launcher&apos;a.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Otwiera okno z ustawieniami wybranej zakladki.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwa zakladke.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz to, jesli chcesz miec duzy wskaznik zajetosci na srodku ekranu zamiast tego w pasku zadan.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz to, jasli chcesz aby ikonki uruchamianych aplikacji migaly przy starcie.</translation>
     </message>
     <message>
         <source>All Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie zakladki</translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zaimplementowane</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
-        <translation type="unfinished"></translation>
+        <translation>Applety do zaladowania w pasku zadan:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz applety, ktore maja sie pokazywac w pasku zadan.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libfreetypefactory.ts b/i18n/pl/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/no/libfreetypefactory.ts
+++ b/i18n/pl/lib.ts
diff --git a/i18n/pl/libbatteryapplet-ipaq.ts b/i18n/pl/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/pl/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index a5408cf..3686a7a 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -1,85 +1,85 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
-        <translation type="unfinished"></translation>
+        <translation>Laduje</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozostaly procent energii</translation>
     </message>
     <message>
         <source>Battery status: </source>
-        <translation type="unfinished"></translation>
+        <translation>Stan baterii:</translation>
     </message>
     <message>
         <source>Good</source>
-        <translation type="unfinished"></translation>
+        <translation>Dobry</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niski</translation>
     </message>
     <message>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Critical</source>
-        <translation type="unfinished"></translation>
+        <translation>Krytyczny</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznany</translation>
     </message>
     <message>
         <source>On backup power</source>
-        <translation type="unfinished"></translation>
+        <translation>Na zasilaniu zapasowym</translation>
     </message>
     <message>
         <source>Power on-line</source>
-        <translation type="unfinished"></translation>
+        <translation>Podlaczony do zasilania</translation>
     </message>
     <message>
         <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Zewnetrzne zasilanie odlaczone</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozostaly czas dzialania baterii</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <source>Battery status</source>
-        <translation type="unfinished"></translation>
+        <translation>Stan baterii</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka</translation>
     </message>
     <message>
         <source>could not open file</source>
-        <translation type="unfinished"></translation>
+        <translation>nie mozna otworzyc pliku</translation>
     </message>
     <message>
         <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Laduje oba urzadzenia</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Pozostaly procent energii:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Pozostaly czas dzialania baterii:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libcardmonapplet.ts b/i18n/pl/libcardmonapplet.ts
index 441a701..f0843b2 100644
--- a/i18n/pl/libcardmonapplet.ts
+++ b/i18n/pl/libcardmonapplet.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udalo sie odlaczenie karty CF/PCMCIA!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udalo sie odlaczenie karty SD/MMC!</translation>
     </message>
     <message>
         <source>New card: </source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa karta:</translation>
     </message>
     <message>
         <source>Ejected: </source>
-        <translation type="unfinished"></translation>
+        <translation>Odlaczona:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
+        <translation>Odlacz karte SD/MMC</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Odlacz karte 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Odlacz karte 1: %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libclipboardapplet.ts b/i18n/pl/libclipboardapplet.ts
index 9b0ac97..fa8d150 100644
--- a/i18n/pl/libclipboardapplet.ts
+++ b/i18n/pl/libclipboardapplet.ts
@@ -1,17 +1,17 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ClipboardApplet</name>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Wytnij</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libclockapplet.ts b/i18n/pl/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/pl/libclockapplet.ts
+++ b/i18n/pl/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/pl/libdialup.ts b/i18n/pl/libdialup.ts
deleted file mode 100644
index 139ade9..0000000
--- a/i18n/pl/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Konto</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nazwa uzytkownika:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Haslo:</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Telefon:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Predkosc:</translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Czas oczekiwania:</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Kontrola przeplywu:</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Sprzetowa</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Na zadanie</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Reczne</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation> sekund</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Czas bezczynnosci</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Automatyczne</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Reczne dzwonienie, automatyczne rozlaczanie</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Siec</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Rozpoznaj serwery nazw</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Brama</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Rozpoznaj routing</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Podstawowy DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Pomocniczy DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>Oczekiwanie na aktywacje</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Inicjalizacja modemu</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>Laczenie</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Autoryzacja</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Brak sygnalu wybierania</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Brak nosnej</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Numer zajety</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Czas zakonczony</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Polaczenie nie powiodlo sie</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Blad autoryzacji</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Polaczony</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Ustwienia proxy</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Bez proxy</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Automatyczna konfiguracja proxy</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Ustaw proxy</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Ustwienia:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Bezposrednio dla:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libflatstyle.ts b/i18n/pl/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/pl/libflatstyle.ts
+++ b/i18n/pl/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libinterfaces.ts b/i18n/pl/libinterfaces.ts
index 407ea1f..560568f 100644
--- a/i18n/pl/libinterfaces.ts
+++ b/i18n/pl/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaawansowane Informacje o Interfejsach</translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation type="unfinished"></translation>
+        <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP</translation>
     </message>
     <message>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Interfejs</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Maska podsieci</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozglaszanie</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres MAC</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o Interfejsie</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Odswiez</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zatrzymaj</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Restart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Maska podsieci</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres MAC</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozglaszanie</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
+        <translation>&amp;Pokaz informacje zaawansowane</translation>
+    </message>
+    <message>
+        <source>be &amp;silent</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja Interfejsu</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie podnos</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja statycznego IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Maska podsieci</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Pierwszy DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Brama</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Drugi DNS</translation>
+    </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished">255.255.255.0</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Restart interfejsu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libirdaapplet.ts b/i18n/pl/libirdaapplet.ts
index 1000064..f87088e 100644
--- a/i18n/pl/libirdaapplet.ts
+++ b/i18n/pl/libirdaapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Znalezione urzadzenie:</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz IrDA</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz IrDA</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz wyszukiwanie</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz wyszukiwanie</translation>
     </message>
     <message>
         <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz odbior</translation>
     </message>
     <message>
         <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz odbior</translation>
     </message>
     <message>
         <source>Found:</source>
-        <translation type="unfinished"></translation>
+        <translation>Znalezione:</translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zgubione:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libkeyview.ts b/i18n/pl/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/pl/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libkppp.ts b/i18n/pl/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/pl/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/liblan.ts b/i18n/pl/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/pl/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index a60e040..f61f2b8 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,71 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Liquid</translation>
+    </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Styl Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bez przezroczystosci</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Przezroczysty pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Przezroczysty pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ustawiona przezroczystosc</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kolor menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kolor tekstu</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nieprzezroczystosc</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Uzywaj cieniowanego tekstu menu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Plaskie przyciski na pasku narzedzi</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kontrast pasków</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/liblogoutapplet.ts b/i18n/pl/liblogoutapplet.ts
index 06cbe25..aebca1f 100644
--- a/i18n/pl/liblogoutapplet.ts
+++ b/i18n/pl/liblogoutapplet.ts
@@ -1,18 +1,19 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrot wyloguj</translation>
     </message>
     <message>
         <source>Logout</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyloguj</translation>
     </message>
     <message>
         <source>Do you really want to
 end this session ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz
+zakonczyc sesje?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmadplugin.ts b/i18n/pl/libmadplugin.ts
index 1ccb02c..0182447 100644
--- a/i18n/pl/libmadplugin.ts
+++ b/i18n/pl/libmadplugin.ts
@@ -1,53 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LibMadPlugin</name>
     <message>
         <source>No Song Open</source>
         <translation>Brak otwartych piosenek</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>Artist</source>
         <translation>Wykonawca</translation>
     </message>
     <message>
         <source>Album</source>
         <translation>Plyta</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Komentarz</translation>
     </message>
     <message>
         <source>, Track: </source>
         <translation>, Sciezka: </translation>
     </message>
     <message>
         <source>Info: </source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje:</translation>
     </message>
     <message>
         <source>Name: </source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Genre: </source>
-        <translation type="unfinished"></translation>
+        <translation>Gatunek:</translation>
     </message>
     <message>
         <source>Bitrate: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: </source>
-        <translation type="unfinished"></translation>
+        <translation>URL:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmail.ts b/i18n/pl/libmail.ts
index 78c7198..3524cec 100644
--- a/i18n/pl/libmail.ts
+++ b/i18n/pl/libmail.ts
@@ -1,100 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MailFactory</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna dolaczyc pliku &apos;%1&apos;. Kontynuowac mimo to, czy anulowac?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynuuj</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
 </context>
 <context>
     <name>SmtpHandler</name>
     <message>
         <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukam hosta...</translation>
     </message>
     <message>
         <source>The server refused the connection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer odmowil polaczenia.</translation>
     </message>
     <message>
         <source>Host lookup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie znaleziono hosta.</translation>
     </message>
     <message>
         <source>The read from the socket failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odczyt z gniazda nie powiodl sie z nieznanego powodu.</translation>
     </message>
     <message>
         <source>The sending failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslanie nie powiodlo sie z nieznanego powodu.</translation>
     </message>
     <message>
         <source>Host found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Host znaleziony.</translation>
     </message>
     <message>
         <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczony z %1</translation>
     </message>
     <message>
         <source>SMTP &gt; %3</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; %3</translation>
     </message>
     <message>
         <source>SMTP&gt; EHLO *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; EHLO *</translation>
     </message>
     <message>
         <source>SMTP&gt; AUTH CRAM-MD5</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; AUTH CRAM-MD5</translation>
     </message>
     <message>
         <source>SMTP&gt; Authenticating</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; Autoryzacja</translation>
     </message>
     <message>
         <source>SMTP&gt; HELO *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; HELO *
+</translation>
     </message>
     <message>
         <source>SMTP&gt; MAIL FROM: *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; MAIL FROM: *</translation>
     </message>
     <message>
         <source>SMTP&gt; RCPT TO: *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; RCPT TO: *</translation>
     </message>
     <message>
         <source>SMTP&gt; DATA</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; DATA</translation>
     </message>
     <message>
         <source>SMTP&gt; Sending data...</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; Wysylanie danych...</translation>
     </message>
     <message>
         <source>SMTP&gt; QUIT (Done)</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP&gt; QUIT (Gotowe)</translation>
     </message>
     <message>
         <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer zwrocil blad. Oto wiadomosc:&lt;BR&gt;%1</translation>
     </message>
     <message>
         <source>SMTP &lt; %3</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &lt; %3</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/librestartapplet.ts b/i18n/pl/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/no/librestartapplet.ts
+++ b/i18n/pl/libmodplugin.ts
diff --git a/i18n/pl/libnetmonapplet.ts b/i18n/pl/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/pl/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libnotesapplet.ts b/i18n/pl/libnotesapplet.ts
index 6bbcf69..1c1ce8f 100644
--- a/i18n/pl/libnotesapplet.ts
+++ b/i18n/pl/libnotesapplet.ts
@@ -1,45 +1,45 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NotesControl</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Delete?</source>
-        <translation type="unfinished"></translation>
+        <translation>Usunac?</translation>
     </message>
     <message>
         <source>Do you really want to&lt;BR&gt;&lt;B&gt; delete&lt;/B&gt; this note ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz&lt;BR&gt;&lt;b&gt; usunac&lt;/b&gt; ta notatke?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Beam Out</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj przez IrDA</translation>
     </message>
     <message>
         <source>Search For...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukaj...</translation>
     </message>
     <message>
         <source>Toggle Maximized</source>
-        <translation type="unfinished"></translation>
+        <translation>Przelacz maksymalizacje</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index b78f90c..24385f3 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -1,108 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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="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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on </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>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libopieobex.ts b/i18n/pl/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/pl/libopieobex.ts
+++ b/i18n/pl/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 97b29f2..7db75f9 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -1,897 +1,955 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Niezdefiniowane</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Biznes</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osobiste</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nowa kategoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nowa kategoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Edycja kategorii</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorie sa tu</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalne</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielone</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Przepraszam, inna aplikacja
 edytuje kategorie.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Edytuj kategorie</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zamknij wybor plikow</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Widok dokumentu</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished">Znajdz</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Brak tekstu.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Znajdz</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Co szukac:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>kategoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Zacznij szukac od:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Gru 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Rozrozniaj wielkosc</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Szukaj wstecz</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Widok dokumentu</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Usuwanie nie powiodlo sie.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopia z </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Blad kopiowania.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Blad przenoszenia dokumentu.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentarz:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Szybkie ladowanie (wykorzystuje pamiec)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>informacje wlasciciela</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Wprowadz haslo</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Jest problem z utworzeniem
 Informacji Konfiguracyjnych
 dla tego programu.
 
 Zwolnij wiecej pamieci i
 sprobuj ponownie.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Nie moge utworzyc plikow startowych
 Prosze zrob wiecej miejsca
 w pamieci</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nie moge uruchomic alarmu
 Zwolnij wiecej pamieci</translation>
     </message>
     <message>
         <source>D</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzien</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiac</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Jestes pewnien ze chces zusunac
+        <translation type="obsolete">Jestes pewnien ze chces zusunac
  %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielony</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres do pracy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Adres e-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Domowy telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Domowy faks: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Domowa komorka: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domowe WWW: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Biznesowe WWW:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Biznesowy telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Biznesowy faks: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Biznesowa komorka: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Biznasowy pager: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Zawod: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Mezczyzna</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Plec: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Urodzony: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Pseudonim: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Tytul</translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Nazwa zawodu</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Wydzial</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Firma</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Biznasowy telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Biznasowy faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Biznasowa komorka</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-maile</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domowy telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domowy faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domowa komorka</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Biznes ulica</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Biznes miasto</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Biznes wojewodztwo</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Biznes kod pocztowy</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Biznes Panstwo</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Biznes pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Biznes WWW</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Zawod</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Dom ulica</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Dom miasto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Dom wojewodztwo</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Dom kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Dom Panstwo&gt;</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Dom WWW</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>malzonek</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Pseudonim</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Dzieci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupy</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Wto</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Sro</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Czw</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Pia</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Nie</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Brak miejsca</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Nie moge ustawic alarmu.
 Zwolnij wiecej miejsca w pamieci</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libsdmonapplet.ts b/i18n/pl/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/pl/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/libtodayaddressbookplugin.ts b/i18n/pl/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/pl/libtodayaddressbookplugin.ts
+++ b/i18n/pl/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtodaydatebookplugin.ts b/i18n/pl/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/pl/libtodaydatebookplugin.ts
+++ b/i18n/pl/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtodaytodolistplugin.ts b/i18n/pl/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/pl/libtodaytodolistplugin.ts
+++ b/i18n/pl/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/no/sfcave-sdl.ts b/i18n/pl/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/no/sfcave-sdl.ts
+++ b/i18n/pl/libtremorplugin.ts
diff --git a/i18n/pl/libwlan.ts b/i18n/pl/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/pl/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libwlanplugin.ts b/i18n/pl/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/pl/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/liquid-settings.ts b/i18n/pl/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/pl/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/mailit.ts b/i18n/pl/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/pl/mailit.ts
+++ b/i18n/pl/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/mediummount.ts b/i18n/pl/mediummount.ts
index 896ec3d..8f647e3 100644
--- a/i18n/pl/mediummount.ts
+++ b/i18n/pl/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pl/mobilemsg.ts b/i18n/pl/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/pl/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/mpegplayer.ts b/i18n/pl/mpegplayer.ts
deleted file mode 100644
index a7fc892..0000000
--- a/i18n/pl/mpegplayer.ts
+++ b/dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation>Brak pliku</translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation>Blad: nie wybrano pliku</translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation>Plik nieznaleziony</translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation>Nastepujacy plik nie zostal znaleziony: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation>Brak dekodera</translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation>Brak dekodara dla tego pliku: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation>Blad otwarcia pliku</translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation>Blad podczas proby odtwarzania pliku: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation> Plik: </translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, Dlugosc: </translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Wybor listy odtwarzania</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation>Operacje odtwarzania</translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Dodaj do listy odtwarzania</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Usun z listy odtwarzania</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Graj</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Losowo</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Petla</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Plik</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Czysc liste</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Dodaj wszystkie pliki dzwiekowe</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Dodaj wszystkie pliki filmowe</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Dodaj wszystkie pliki</translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation>Zapisz liste odtwarzania</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Widok</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Pelen ekran</translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation>Rozmiar</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>W gore</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Usun</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>W dol</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Tytul</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Rozmiar</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>Brak pamieci</translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation>Jest problem z zapisaniem listy.
-Twoja playliste moze byc niekompletan
-po nastepnym odczycie.</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Bledny plik</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Napotkalem problem w pobieraniu pliku.</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Zapisz liste</translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation>To juz jest w twojej liscie.
-Kontynuowac?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Tak</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>NIe</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>Usun liste?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>Naprawde chcesz usunac
-liste?</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Wlasciwosci</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Odtwarzaj wybrane</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/netsetup.ts b/i18n/pl/netsetup.ts
deleted file mode 100644
index 8da8873..0000000
--- a/i18n/pl/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Dodaj siec</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Dodaj</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Wroc</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Blad</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Siec</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Siec</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Obecna</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;Status obecnie uruchomionych uslug sieciowych.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Uslugi</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Dodaj...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;P&gt;Sieciowe uslugi obecnie dostepne.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Usun</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Wlasciwosci</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/networksettings.ts b/i18n/pl/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/pl/networksettings.ts
+++ b/i18n/pl/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/odict.ts b/i18n/pl/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/pl/odict.ts
+++ b/i18n/pl/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/oipkg.ts b/i18n/pl/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/pl/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/opie-console.ts b/i18n/pl/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/pl/opie-console.ts
+++ b/i18n/pl/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opie-login.ts b/i18n/pl/opie-login.ts
index 42551e6..f4806d5 100644
--- a/i18n/pl/opie-login.ts
+++ b/i18n/pl/opie-login.ts
@@ -1,83 +1,83 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
+        <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opie-sheet.ts b/i18n/pl/opie-sheet.ts
deleted file mode 100644
index 322b113..0000000
--- a/i18n/pl/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/opieirc.ts b/i18n/pl/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/pl/opieirc.ts
+++ b/i18n/pl/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opiemail.ts b/i18n/pl/opiemail.ts
deleted file mode 100644
index f069133..0000000
--- a/i18n/pl/opiemail.ts
+++ b/dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation>Odpowiedz</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation>Odpowiedz wszystkim</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Usun</translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation>Temat</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Wroc</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation>Kolejka</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Wyslij</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation>Od:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation>Do:</translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation>Widok</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation>Redaguj</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Poczta</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation>Konfiguruj OpieMail</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation>Konfiguracja OpieMail</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation>Foldery</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Dodaj</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation>&amp;Zmien</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Usun</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation>Nazwa folderu</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation>Tozsamosc</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nazwa</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Uzytkownik</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protokol</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation>Usun skrytke</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation>Usunac skrytke?
-Wszystkie wiadomosci beza usuniete.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation>Konfiguracja folderow OpieMail</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation>Opis:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation>OpieMail konfiguracja tozsamosci</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation>Podpis:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Tozsamosc</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation>Organizacja:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation>Odpowiedz do:</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation>Uzywaj do wysylania</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protokol</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation>Docelowy folder</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Haslo</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation>Wlacz sprawdzanie cykliczne</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation>Sprawdz co:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minut</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation>&amp;Usun wiadomosc z serwera gdy zostanie usunieta lokalnie.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation>&amp;Pozostaw wiadomosc na serwerze</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Nazwa:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished">Protokol</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Haslo</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation>Serwer wymaga autoryzacji</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation>Temat</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Do</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation>Nadawca</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation>(Re)edycja</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation>Kopiuj do</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation>Przenies do</translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/opieplayer.ts b/i18n/pl/opieplayer.ts
index b8f82ba..b142db6 100644
--- a/i18n/pl/opieplayer.ts
+++ b/i18n/pl/opieplayer.ts
@@ -1,268 +1,258 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opieplayer2.ts b/i18n/pl/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/pl/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/opierec.ts b/i18n/pl/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/pl/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/osearch.ts b/i18n/pl/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/pl/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/patience.ts b/i18n/pl/patience.ts
index be48808..d59567b 100644
--- a/i18n/pl/patience.ts
+++ b/i18n/pl/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Gra</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Zmien Rewers Kart</translation>
+        <translation type="obsolete">&amp;Zmien Rewers Kart</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Skocz do pozycji&gt;</translation>
+        <translation type="obsolete">&amp;Skocz do pozycji&gt;</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Graj</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Zmien Rewers Kart</translation>
+        <translation type="obsolete">Zmien Rewers Kart</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Skocz do pozycji</translation>
+        <translation type="obsolete">Skocz do pozycji</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Obroc jedna karte</translation>
+        <translation type="obsolete">Obroc jedna karte</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Obroc trzy karty</translation>
+        <translation type="obsolete">Obroc trzy karty</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/qpdf.ts b/i18n/pl/qpdf.ts
index 2f03c32..828cbdf 100644
--- a/i18n/pl/qpdf.ts
+++ b/i18n/pl/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>50%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>75%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>125%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>150%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist !</source>
+        <source>File does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index f692d4a..10ba42e 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/reader.ts b/i18n/pl/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/pl/reader.ts
+++ b/i18n/pl/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/rotation.ts b/i18n/pl/rotation.ts
deleted file mode 100644
index 80d0230..0000000
--- a/i18n/pl/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished">Ustawienia orientacji</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 417e182..f9325a7 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -1,106 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Ustaw haslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Haslo bledne</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Haslo nieprawidlowe.
 Dostep zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Ustawienia bezpieczenstwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Wyczysc haslo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Wymaj hasla po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptuj synchronizacje z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Haslo zabezpieczajace pozwala na minimalny poziom zabezpieczen do tego urzadzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/snake.ts b/i18n/pl/snake.ts
index 4a77fd5..9a27b3a 100644
--- a/i18n/pl/snake.ts
+++ b/i18n/pl/snake.ts
@@ -1,43 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Waz</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nowa gra</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>WAZ!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Uzywaj klawiszy strzalek do poruszania
 weza i jedzenia myszek. Musisz
 nie wpadac na sciany i przeszkody</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Wcisnij dowolny klawisz do uruchomienia</translation>
+        <translation type="obsolete">Wcisnij dowolny klawisz do uruchomienia</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>     Wynik :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>KONIEC GRY!
  Twoj wynik: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Wcisnij dowolny klawisz a rozpoczniesz gre.</translation>
+        <translation type="obsolete">Wcisnij dowolny klawisz a rozpoczniesz gre.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/spreadsheet.ts b/i18n/pl/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/pl/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pl/stockticker.ts b/i18n/pl/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/pl/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index d9f41ed..a86516d 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -1,302 +1,272 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Aplikacje CPU (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywane (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Bufory (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Podreczna (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Wolne (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Calkowita: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Wyslane</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywane (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Dostepne (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Komenda</translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Wyslane</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <source>You really want to send %1 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacja o systemie</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Pamiec</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Dyski</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesy</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versja</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilowana przez: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Utworzona: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/systemtime.ts b/i18n/pl/systemtime.ts
index 1a94a08..2259c4a 100644
--- a/i18n/pl/systemtime.ts
+++ b/i18n/pl/systemtime.ts
@@ -1,312 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished">Format czasu</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished">gg:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished">D/M gg:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished">12/24 godzin</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished">24 godziny</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished">12 godzin</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished">Format daty</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished">Tydzien zaczyna sie w</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished">Niedziele</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished">Poniedzialek</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Strefa czasowa</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Format czasu</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 godziny</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 godzin</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Tydzien zaczyna sie w</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Niedziele</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Poniedzialek</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Format daty</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Format apletu</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">gg:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M gg:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Godzin</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuta</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished">Godzin</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished">Minuta</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tetrix.ts b/i18n/pl/tetrix.ts
index adfad20..14c00e0 100644
--- a/i18n/pl/tetrix.ts
+++ b/i18n/pl/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished">Poziom</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Nastepny</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Wynik</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Poziom</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Usunietych</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index 0390ca7..c7e18bb 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -1,264 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Wytnij</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Znajdz...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Powieksz</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomniejsz</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Zawijal linie</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Zacznij w nowym pliku</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Znajdz nastepny</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zamknij wyszukiwanie</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Edytor tekstu</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished">Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished">Nienazwany</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished">Uprawnienia</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished">Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">Nie</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>inni</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Wlasciciel</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
     <message>
         <source>read</source>
         <translation>odczyt</translation>
     </message>
     <message>
         <source>write</source>
         <translation>zapis</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>wykonywanie</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Uwaga</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Blad- nie ma uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Blad- brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Blad ustawiania uprawnien</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Blad ustawienia trybu</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tictac.ts b/i18n/pl/tictac.ts
index 30d6200..038215c 100644
--- a/i18n/pl/tictac.ts
+++ b/i18n/pl/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Komputer pierwszy</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Czlowiek pierwszy</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Graj!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Wyjdz</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Wcisnij Play do startu</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Wykonaj moj ruch</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Wygrales!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Wygralem!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>To jest linia</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tinykate.ts b/i18n/pl/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/pl/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 6efe1a8..74c5ec8 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,117 +1,138 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>minutes inactive</source>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc</source>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon size</source>
+        <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the icon size in pixel</source>
+        <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How often should Today refresh itself</source>
+        <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 59b9282..bbe07c3 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,555 +1,581 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nowy proces</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Edycja procesu</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Znajdz</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished">Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Brak pamieci</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">ZrobTo</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Nieprzypisany</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information about this task here.</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo List</source>
+        <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pl/ubrowser.ts b/i18n/pl/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/pl/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/usermanager.ts b/i18n/pl/usermanager.ts
index 282a43f..28f3895 100644
--- a/i18n/pl/usermanager.ts
+++ b/i18n/pl/usermanager.ts
@@ -1,31 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
+        <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/wellenreiter.ts b/i18n/pl/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/pl/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/pl/wlansetup.ts b/i18n/pl/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/pl/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/.directory b/i18n/pt/.directory
index 41b83b1..a27342f 100644
--- a/i18n/pt/.directory
+++ b/i18n/pt/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Portuguese
 Name[da]=Portugisisk
 Name[es]=Portugués
 Name[it]=Portoghese
 Name[pt]=Português
 Name[pt_BR]=Português
 Name[sl]=Portogalščina
+Name[de]=Portugisisch
+Name[nl]=Portugees
\ No newline at end of file
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index cc23bb4..e20389c 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -1,1508 +1,1514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Escolher</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contacto</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Irradiar Entrada</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Dados</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar os Meus Dados</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Importar cartão de visita</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Procura</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Gravar todos os Dados</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Não Encontrado</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Cartões</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Cartão</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Iniciar Procura</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de ficheiro correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>Não foi encontrado nenhum contacto para esta pesquisa!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
+        <translation>O ficheiro selecionado
+não tem a extensão &quot;.vcf&quot;.
+Tem a certeza que o quer abrir?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Adicionar Contacto?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer adicionar o
+contacto para %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sim para &amp;Todos</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Tem de selecionar um contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Tem de selecionar um nome de ficheiro!</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Tipo de Pesquisa</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar expressões (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignorar letras grandes/pequenas</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>E-Mail</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>Preferir QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferir Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation type="unfinished"></translation>
+        <translation>Atenção: O QT-Mail só 
+está disponível para o 
+SHARP. O Opie-Mail é
+livre e está disponível em
+todos os dispositivos!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Search Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações da Procura</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione a Ordem dos Contactos:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique na pasta para seleccionar uma</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações para o estilo da procura</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
-        <translation type="unfinished"></translation>
+        <translation>A procura usa expressões regulares se for selecionado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
-        <translation type="unfinished"></translation>
+        <translation>A procura usa apenas expressões simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
-        <translation type="unfinished"></translation>
+        <translation>Se selecionado, a procura diferencia entre os caractéres grandes e pequenos</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho da fonte para a lista e para a vista dos cartões</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações da fonte para a lista e para a vista de cartões</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar a aplicação de mail da Sharp, se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar a aplicação de mail do Opie, se disponível</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover o atributo selecionado para cima uma linha</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
-        <translation type="unfinished"></translation>
+        <translation>MoMover o atributo selecionado para baixo uma linha</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicione os atributos selecionados da lista abaixo para a lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Remove os atributos selecionados da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordena (cima -&gt; baixo) define o contacto primário a mostrar na segunda coluna da vista em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Ferramenta-/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para menus ou barras de ferramentas fixas depois de reiniciar a aplicação!</translation>
     </message>
     <message>
         <source>Moveable</source>
-        <translation type="unfinished"></translation>
+        <translation>Amovível</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para menus ou barras de ferramentas amovíveis depois de reiniciar a aplicação!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Nome Completo...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Emprego</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Código Postal</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Inglaterra</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
         <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Introduza Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argetina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbeijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutam</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilha Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
+        <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Ilhas Caiman</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Chad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilha da Natividade</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Colômbia</translation>
     </message>
     <message>
         <source>Comoros</source>
-        <translation type="unfinished"></translation>
+        <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilha do Cook </translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
+        <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Croácia</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Républica Checa</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation type="unfinished"></translation>
+        <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Républica Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Timor Leste</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipto</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Guiné Equatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
-        <translation type="unfinished"></translation>
+        <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estónia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidji</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finlândia</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Guiné Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Polinésia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabão</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
-        <translation type="unfinished"></translation>
+        <translation>Groenelândia</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation type="unfinished"></translation>
+        <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Guiné</translation>
     </message>
     <message>
         <source>Guyana</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation type="unfinished"></translation>
+        <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Hungria</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islândia</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Índia</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonésia</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Itália</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordania</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Casaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Quénia</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Coreia</translation>
     </message>
     <message>
         <source>Laos</source>
-        <translation type="unfinished"></translation>
+        <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation type="unfinished"></translation>
+        <translation>Latvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation type="unfinished"></translation>
+        <translation>Lebanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesotho</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
+        <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lituânia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Macedónia</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
-        <translation type="unfinished"></translation>
+        <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
-        <translation type="unfinished"></translation>
+        <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
-        <translation type="unfinished"></translation>
+        <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritânia</translation>
     </message>
     <message>
         <source>Mauritius</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation type="unfinished"></translation>
+        <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
-        <translation type="unfinished"></translation>
+        <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>Mónaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation type="unfinished"></translation>
+        <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>Marrocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation type="unfinished"></translation>
+        <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova Caledónia</translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation>Nova Zelândia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation>Nicarágua</translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation type="unfinished"></translation>
+        <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation type="unfinished"></translation>
+        <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
-        <translation type="unfinished"></translation>
+        <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
         <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
         <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
         <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
         <translation>Polónia</translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation type="unfinished"></translation>
+        <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation>Ilha da Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
         <translation>Roménia</translation>
     </message>
     <message>
         <source>Russia</source>
         <translation>Rússia</translation>
     </message>
     <message>
         <source>Rwanda</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruânda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
+        <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
-        <translation type="unfinished"></translation>
+        <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation>São Marinho</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation>Arábia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation>Seicheles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
+        <translation>Serra Leona</translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation>Eslováquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation>Eslovénia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
         <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation>Siri Lanca</translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation>Santa Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation type="unfinished"></translation>
+        <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation type="unfinished"></translation>
+        <translation>Swaziland</translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tajikstan</translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
-        <translation type="unfinished"></translation>
+        <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation type="unfinished"></translation>
+        <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Turkmenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzbekistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Virgem</translation>
     </message>
     <message>
         <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
+        <translation>Sahara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
-        <translation type="unfinished"></translation>
+        <translation>Yemen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation>Juguslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
+        <translation>Zimbabué</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Kuwait</source>
-        <translation type="unfinished"></translation>
+        <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
-        <translation type="unfinished"></translation>
+        <translation>Antártica</translation>
     </message>
     <message>
         <source>Armenia</source>
-        <translation type="unfinished"></translation>
+        <translation>Arménia</translation>
     </message>
     <message>
         <source>Bolivia</source>
-        <translation type="unfinished"></translation>
+        <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
-        <translation type="unfinished"></translation>
+        <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
-        <translation type="unfinished"></translation>
+        <translation>Guana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
-        <translation type="unfinished"></translation>
+        <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
-        <translation type="unfinished"></translation>
+        <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Kyrgyzstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Territórios Ocupados Palestinianos</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
-        <translation type="unfinished"></translation>
+        <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha para introduzir o ultimo, do meio e primeiro nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o nome completo directamente. Se tiver um apelido com várias palavras (por exemplo, &quot;da Silva&quot;), escreva &lt;apelido&gt;,&lt;nomes&gt; tal como: &quot;da Silva, Rosa Margarida&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
-        <translation type="unfinished"></translation>
+        <translation>O título (emprego)..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
-        <translation type="unfinished"></translation>
+        <translation>Exemplo: &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
-        <translation type="unfinished"></translation>
+        <translation>O local de trabalho do contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
-        <translation type="unfinished"></translation>
+        <translation>Use para escolher o atributo a mudar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
-        <translation type="unfinished"></translation>
+        <translation>Use para escolher o formato para gravar o nome e mostrar na lista</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation type="unfinished">Telefone (Empresa)</translation>
+        <translation>Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation type="unfinished">Fax (Empresa)</translation>
+        <translation>Fax (Empresa)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation type="unfinished">Telemóvel (Empresa)</translation>
+        <translation>Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation type="unfinished"></translation>
+        <translation>EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation type="unfinished">E-Mails</translation>
+        <translation>Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation type="unfinished">Telefone (Pessoal)</translation>
+        <translation>Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation type="unfinished">Fax (Pessoal)</translation>
+        <translation>Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation type="unfinished">Telemóvel (Pessoal)</translation>
+        <translation>Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">Escritório</translation>
+        <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation type="unfinished">Profissão</translation>
+        <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation type="unfinished">Assistente</translation>
+        <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation type="unfinished">Chefe</translation>
+        <translation>Chefe</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation type="unfinished">Esposa</translation>
+        <translation>Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation type="unfinished">Sexo</translation>
+        <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation type="unfinished">Nascimento</translation>
+        <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation type="unfinished">Aniversário</translation>
+        <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished">Alcunha</translation>
+        <translation>Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation type="unfinished">Filhos</translation>
+        <translation>Filhos</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation type="unfinished">Nome</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation type="unfinished">Nome do Meio</translation>
+        <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation type="unfinished">Apelido</translation>
+        <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation type="unfinished">Sufixo</translation>
+        <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation type="unfinished">Ficheiro Como</translation>
+        <translation>Gravar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation>Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation type="unfinished">Departamento</translation>
+        <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation type="unfinished">Empresa</translation>
+        <translation>Empresa</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation type="unfinished">Rua (Empresa)</translation>
+        <translation>Rua (Empresa)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation type="unfinished">Cidade (Empresa)</translation>
+        <translation>Cidade (Empresa)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation type="unfinished">Estado (Empresa)</translation>
+        <translation>Estado (Empresa)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation type="unfinished">Cód Postal (Empresa)</translation>
+        <translation>Cód. Postal (Empresa)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation type="unfinished">País (Empresa)</translation>
+        <translation>País (Empresa)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation type="unfinished">Pager (Empresa)</translation>
+        <translation>Pager (Empresa)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation type="unfinished">Site (Empresa)</translation>
+        <translation>WebSite (Empresa)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation type="unfinished">Rua (Pessoal)</translation>
+        <translation>Rua (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation type="unfinished">Cidade (Pessoal)</translation>
+        <translation>Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation type="unfinished">Estado (Pessoal)</translation>
+        <translation>Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation type="unfinished">Cód. Postal (Pessoal)</translation>
+        <translation>Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished">País (Pessoal)</translation>
+        <translation>País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation type="unfinished">Site (Pessoal)</translation>
+        <translation>WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation>Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index 9e3af51..1882bf3 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -1,304 +1,378 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor de Ficheiros Avançado</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Mostrar Escondidos</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Criar Directoria</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Run Command</source>
-        <translation type="unfinished"></translation>
+        <translation>Executar Comando</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Executar Comando e ver Resultado</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para Local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para Remoto</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mudar o nome</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>A directoria não existe</translation>
     </message>
     <message>
         <source>Copy As</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar Como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado do AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
+        <translation>Irradiar</translation>
     </message>
     <message>
         <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviado.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Directoria</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>Open as text</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir como texto</translation>
     </message>
     <message>
         <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar atalho Simbólico</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>File Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Info do Ficheiro</translation>
     </message>
     <message>
         <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Permissões</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
+        <translation>Irradiar Ficheiro</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar para a mesma Directoria</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possivel copiar
+</translation>
     </message>
     <message>
         <source>to
 </source>
-        <translation type="unfinished"></translation>
+        <translation>para
+</translation>
     </message>
     <message>
         <source>Could not move
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mover
+</translation>
     </message>
     <message>
         <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar aos Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Acções</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionar Tudo</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar mesmo
+os ficheiros %1?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar Directoria?</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar mesmo
+os ficheiros %1?</translation>
     </message>
     <message>
         <source>File Exists!</source>
-        <translation type="unfinished"></translation>
+        <translation>O ficheiro existe!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>
+existe. Sobrepor?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
+        <translation>já existe.
+Quer mesmo apagá-lo?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 existe. Sobrepor?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível copiar %1 para %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor de Ficheiros Avançado
+é copyright 2002-2003
+L.J.Potter &lt;llornkcor@handhelds.org&gt;
+e licenciado sob a licença GPL</translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation>Atalho para Directoria</translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation>Apagar a directoria actual dos atalhos</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
-        <translation type="unfinished"></translation>
+It is not bookmarked!</source>
+        <translation>Não é possível apagar a directoria
+dos atalhos.
+Não existe na lista!</translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
-        <translation type="unfinished"></translation>
+        <source>File Search</source>
+        <translation>Procurar Ficheiro</translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation>Apagar mesmo
+os ficheiros %1
+e os seus conteúdos?</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
+        <source>Really delete
+%1?</source>
+        <translation>Apagar mesmo
+%1?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">Gestor de Ficheiros ::</translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete">KB livres</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">Copiar &apos;%1&apos; Como</translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source> As</source>
+        <translation>Como</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar resultado no ficheiro (apenas nome)</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado</translation>
+    </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>Não foi possível iniciar o processo</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>Erro
+</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>
+Terminado
+</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar Permissões do Ficheiro</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar Permissões do Ficheiro para:</translation>
     </message>
     <message>
         <source>owner</source>
-        <translation type="unfinished"></translation>
+        <translation>utilizador</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizador</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>Atenção</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>Erro - sem utilizador</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>Erro - sem grupo</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>Erro ao alterar o utilizador ou grupo</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>Erro ao alterar o modo</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index a216438..e6ef222 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -1,270 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações...</translation>
     </message>
     <message>
         <source>Current scheme</source>
-        <translation type="unfinished">Esquema actual</translation>
+        <translation>Esquema actual</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished">Gravar</translation>
+        <translation>Gravar</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Forçar o estilo nas aplicações todas.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
+        <translation>Desactivar estilo para as seguintes aplicações (pode usar &lt;b&gt;*&lt;/b&gt; para escolher várias):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro(s) Binário(s)</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo da Pasta:</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastas c/icones</translation>
     </message>
     <message>
         <source>Drop down list</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista com icones</translation>
     </message>
     <message>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Em Cima</translation>
     </message>
     <message>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Em Baixo</translation>
     </message>
     <message>
         <source>Style</source>
-        <translation type="unfinished">Estilo</translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished">Fonte</translation>
+        <translation>Fonte</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished">Cores</translation>
+        <translation>Cores</translation>
     </message>
     <message>
         <source>Windows</source>
-        <translation type="unfinished"></translation>
+        <translation>Janelas</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Avançadas</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished">Reiniciar</translation>
+        <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Deseja reiniciar %1 agora?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished">Sim</translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished">Não</translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Esquema</translation>
     </message>
     <message>
         <source>Save scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar esquema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
+        <translation>O esquema já existe.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
-        <translation type="unfinished">Apagar esquema</translation>
+        <translation>Apagar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
-        <translation type="unfinished">O esquema actual não pode ser apagado.</translation>
+        <translation>O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;novo&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
+        <translation>Os estilos controlam a forma com que serão desenhados os botões e as barras de deslize das aplicações.
+
+Clique aqui para escolher um estilo.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para configurar o estilo actual.
+
+Nota: esta opção não está disponível em todos os estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
+        <translation>A decoração das janelas controla a forma com que serão desenhadas a barra do título e respectivos botões.
+
+Clique aqui para escolher uma decoração.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o nome, estilo e tamanho da fonte por omissão a ser usada pelas aplicações.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Os esquemas de cores são uma coleção de cores a serem usadas em várias zonas do ecrã.
+
+Clique aqui para escolher um esquema.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar as cores do esquema actual.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para apagar um esquema de cores da lista.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para dar um nome e gravar o esquema de cores actual.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para permitir que todas as aplicações usem as configurações globais de aparência.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Se for necessário, é possível desactivar determinados detalhes por cada aplicação, por exemplo se uma aplicação não ficar bem com os parametros globais.
+
+Nesta área poderá selecionar a aplicação e a configuração que deseja desactivar.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar um aplicação à lista acima.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para apagar uma aplicação selecionada.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mover a aplicação selecionada para cima.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mover a aplicação selecionada para baixo.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher um estilo para janelas com pastas (tal como esta aplicação). Os estilos disponíveis são:
+
+1. Pastas - pastas normais apenas com texto
+2. Pastas com Icones - pastas com icones para cada pasta e texto adicional na pasta selecionada
+3. Listas - uma lista vertical com as várias opções
+4. Listas com Icones - uma lista vertical com icones</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para que as pastas apareçam em cima.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para que as pastas apareçam em baixo.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é uma janela de previsão. Aqui poderá prever como as suas opções alterarão a aparência.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações de Aparência</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sentido da rotação:</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Editar esquema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma cor para:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
-        <translation type="unfinished"></translation>
+        <translation>Exemplo</translation>
     </message>
     <message>
         <source>Normal Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Item Normal</translation>
     </message>
     <message>
         <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
+        <translation>Item Desabilitado</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
     <message>
         <source>Normal Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto Normal</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto Escolhido</translation>
     </message>
     <message>
         <source>Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão</translation>
     </message>
     <message>
         <source>Check Box</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa de Selecção</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Janela de exemplo usando as configurações selecionadas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/aqpkg.ts b/i18n/pt/aqpkg.ts
index 348cc10..795bd7c 100644
--- a/i18n/pt/aqpkg.ts
+++ b/i18n/pt/aqpkg.ts
@@ -1,546 +1,683 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtro por Categoria</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione um ou mais grupos</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
+        <translation>A ler a configuração...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar
+</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Instalar
+</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Re-Instalar)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Actualizar)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destino</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished"></translation>
+        <translation>Espaço Disponível</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tudo</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abortar</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Abortado pelo utilizador ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Processo Abortado ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Resultado</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconhecido</translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignorar Dependências</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Forçar Reinstalação</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Forçar Remoção</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
+        <translation>Forçar Sobreposição</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Nível de Informação</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Apenas Erros</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens Normais</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens de informação</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation>Analisar resultado</translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>A processar o pacote %1</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>A remover links simbólicos...
+</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>A criar os links simbólicos para %1.</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>A criar os links simbólicos para %1</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>Concluído</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>A remover o ficheiro de estado...</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>ficheiro de estado -</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>pacote - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>Não foi possível abrir o ficheiro de status - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>Não foi possível criar o ficheiro de estado temporário - </translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>Não foi possível executar o ipkg</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>Não foi possível abrir: </translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>A criar a directoria</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>Ligado %1 a %2</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>Falhou a ligação de %1 a %2</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>%1 apagado</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>Falhou a remoção de %1</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>Apagado</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>Falhou a remoção</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>AQPkg - Gestor de Software</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o texto para procurar aqui.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para esconder a barra de ferramentas de salto rápido.</translation>
     </message>
     <message>
         <source>Update lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar Listas</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para actualizar a lista de pacotes dos servidores.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para actualizar todos os pacotes que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para obter os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Apply changes</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicar Alterações</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para instalar, remover ou actualizar os pacotes seleccionados.</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Acções</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes por instalar</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mostrar os pacotes disponíveis que não estão instalados.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes instalados</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para motrar os pacotes instalados neste dispositivo.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pacotes por actualizar</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para motrar os pacotes instalados neste dispositivo e que tenham disponível uma versão mais recente.</translation>
     </message>
     <message>
         <source>Filter by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mostrar os pacotes que pertençam a uma determinada categoria.</translation>
     </message>
     <message>
         <source>Set filter category</source>
-        <translation type="unfinished"></translation>
+        <translation>Filtrar por categoria</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar a filtragem de pacotes por categoria.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para procurar pacotes por texto no nome.</translation>
     </message>
     <message>
         <source>Find next</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar Próxima</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para procurar o próximo pacote que contenha o texto que procura no nome.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
+        <translation>Teclado de Salto Rápido</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mostrar ou esconder o teclado que permite um movimento rápido na lista de pacotes.</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para configurar esta aplicação.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para esconder a barra de pesquisa.</translation>
     </message>
     <message>
         <source>Servers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidores:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para seleccionar uma fonte de pacotes.</translation>
     </message>
     <message>
         <source>Packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Pacotes</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a lista de todos os pacotes disponíveis no servidor seleccionado.
+
+Um ponto azul perto do nome do pacote indica que está instalado.
+
+Um ponto azul com uma estrela indica que existe uma nova versão disponível neste servidor.
+
+Clique na caixa à esquerda para seleccionar um pacote.</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para desinstalar os pacotes seleccionado.</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>A criar a lista de servidores:
+    %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
+        <translation>A criar a lista de servidores para:
+    %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
+        <translation>A actualizar a lista de pacotes disponíveis</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>ATENÇÃO: Não é recomendada
+a actualização do Opie/Qtopia 
+enquanto o está a usar!
+
+Tem a certeza?</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Atenção</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>A actualizar os pacotes instalados</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer apagar %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza?</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>Download to where</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter para onde</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a directoria para onde gravar</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalar Pacotes Remotos</translation>
     </message>
     <message>
         <source>Enter package location</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a localização do pacote</translation>
     </message>
     <message>
         <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada a fazer</translation>
     </message>
     <message>
         <source>No packages selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum pacote selecionado</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Quer remover ou reinstalar %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover ou Reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
+        <translation>Reinstalar</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Quer remover ou actualizar %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover ou Actualizar</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation>A actualizar a lista de aplicações...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Descrição&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Instalado Em&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Tamanho&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Secção&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Nome do Ficheiro&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Versão Instalada&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Versão Disponível&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação do Pacote</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>A informação do pacote não está disponível</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>Pacotes instalados</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>Pacotes locais</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>N/A</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>Pacote - %1 versão %2</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>versão instalada - %1</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>Sem versão.</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>O valor da época na versão não é um número.</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>Nada depois do ponto no número da versão.</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidores</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished"></translation>
+        <translation>Destinos</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxies</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor Activo</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished"></translation>
+        <translation>Destino</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Localização:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligar à raiz </translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy HTTP</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>Activo</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation>Proxy FTP</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Conta:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra Chave:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/backgammon.ts b/i18n/pt/backgammon.ts
index 4eb9e18..14d3a8f 100644
--- a/i18n/pt/backgammon.ts
+++ b/i18n/pt/backgammon.ts
@@ -1,2 +1,169 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>Configuração</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Salvar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>?</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Eliminar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Expôr&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Proteger&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Salvaguardado&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Vazio&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>Valores por Omissão</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>Ajuda</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>Traga as peças para longe da zona do fim</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>Eliminar uma peça do oponente</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>Exponha as suas peças.
+Depois dessa jogada apenas uma peça poderá ficar no slot</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>Proteja uma peça isolada colocando
+outra peça nesse slot</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>Mova a peça para outro slot
+ocupado por si</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>Mova a peça para um slot vazio</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>Use o botão &quot;?&quot; para ajuda</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>Backgammon</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Novo</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gravar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>Jogo</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>Omissão</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>Jogador</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>IA</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>Regras</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>apagar tema %1?</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>Ler Tema</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>&lt;b&gt;nenhuma jogada&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Jogador 1 ganhou. Clique no tabuleiro para um novo jogo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Jogador 2 ganhou. Clique no tabuleiro para um novo jogo.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;J2 a jogar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>&lt;b&gt;J1 a jogar&lt;/b&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/backup.ts b/i18n/pt/backup.ts
index 7c45a05..4e41e3b 100644
--- a/i18n/pt/backup.ts
+++ b/i18n/pt/backup.ts
@@ -1,52 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
+        <translation>Cópia de Segurança... a processar...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Cópia de Segurança</translation>
+    </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>Erro do sitema:
+</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>Mensagem</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>Falhou a Cópia de Segurança!</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>Detalhes</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>Falhou a Cópia de Segurança!</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>Cópia de Segurança bem sucedida.</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>Escolha algo para repôr.</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>Falhou a Reposição.</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>Não foi possível abrir o ficheiro %1</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>Reposição bem sucedida.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicações</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Gravar Para</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cópia de Segurança</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>Reposição</translation>
     </message>
     <message>
         <source>Select Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha a fonte</translation>
     </message>
     <message>
         <source>Column 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Coluna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Reposição</translation>
+    </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>Actualizar a lista de ficheiros</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>Informação de Erro</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>Mensagem de Erro:</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>&amp;Ok</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/bounce.ts b/i18n/pt/bounce.ts
index 20d0942..b405200 100644
--- a/i18n/pt/bounce.ts
+++ b/i18n/pt/bounce.ts
@@ -1,100 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
-        <translation type="unfinished"></translation>
+        <translation>Bounce</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Novo jogo</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Pausar jogo</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Acerca</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Pontuação: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Vidas: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
+        <translation>Preenchido: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Tempo: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nível %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Pontuação: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
-        <translation type="unfinished"></translation>
+        <translation>Jogo parado.
+Prima uma tecla para continuar!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fim do jogo!
+Pontuação: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Tempo: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Vidas: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
+        <translation>Preenchido: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
+        <translation>Preenchido: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Preenchido mais de 75%.
+</translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 pontos: 15 pontos por vida
+</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 pontos: Bónus
+</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 pontos: Pontuação total
+</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
+        <translation>No nível %1.
+Ganhou %2 vidas desta vez!</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>Acerca</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>Escrito por: Stefan Schimanski
+Adaptado por: Martin Imobersteg
+
+Clique para formar paredes.
+Use o espaço para mudar a direção da parede.
+Tente reduzir o espaço total em 75%.
+
+Este programa é distribuido sob os termos
+da licença GPL v2.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/buttonsettings.ts b/i18n/pt/buttonsettings.ts
index cf1f4aa..28f231a 100644
--- a/i18n/pt/buttonsettings.ts
+++ b/i18n/pt/buttonsettings.ts
@@ -1,112 +1,112 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ButtonSettings</name>
     <message>
         <source>Button Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração dos Botões</translation>
     </message>
     <message>
         <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;Clique ou prima e espere o botão que deseja alterar.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Press:</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique:</translation>
     </message>
     <message>
         <source>Hold:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prima e Espere:</translation>
     </message>
     <message>
         <source>Beam VCard</source>
         <translation>Irradiar vCard</translation>
     </message>
     <message>
         <source>Send eMail</source>
         <translation>Enviar E-Mail</translation>
     </message>
     <message>
         <source>Toggle Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternar Menu</translation>
     </message>
     <message>
         <source>Toggle O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Alternar Menu Principal</translation>
     </message>
     <message>
         <source>Show Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar Ambiente de Trabalho</translation>
     </message>
     <message>
         <source>Toggle Recording</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar Gravador</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Ignorado&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Mostrar &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Chamar &lt;br&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;nobr&gt;Chamar &lt;br&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
 </context>
 <context>
     <name>RemapDlg</name>
     <message>
         <source>%1 %2</source>
         <comment>(hold|press) buttoname</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2</translation>
     </message>
     <message>
         <source>Held</source>
-        <translation type="unfinished"></translation>
+        <translation>Largado</translation>
     </message>
     <message>
         <source>Pressed</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregado</translation>
     </message>
     <message>
         <source>No mapping</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mapeamento</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Omissão</translation>
     </message>
     <message>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>Personalizado</translation>
     </message>
     <message>
         <source>Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Acções</translation>
     </message>
     <message>
         <source>Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar</translation>
     </message>
 </context>
 <context>
     <name>RemapDlgBase</name>
     <message>
         <source>Action</source>
-        <translation type="unfinished"></translation>
+        <translation>Acção</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/calibrate.ts b/i18n/pt/calibrate.ts
new file mode 100644
index 0000000..25270bd
--- a/dev/null
+++ b/i18n/pt/calibrate.ts
@@ -0,0 +1,15 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>Clique na cruz com firmeza e precisão
+para calibrar o seu ecrâ.</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>Bem-Vindo ao Opie</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 77b4422..6ab7630 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -1,505 +1,524 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Despesas</translation>
     </message>
     <message>
         <source>New checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova despesa</translation>
     </message>
     <message>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
-        <translation type="unfinished"></translation>
+        <translation>Transações</translation>
     </message>
     <message>
         <source>Charts</source>
-        <translation type="unfinished"></translation>
+        <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o nome da despesa aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o tipo de despesa aqui.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation type="unfinished"></translation>
+        <translation>Poupanças</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Cheques</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation type="unfinished"></translation>
+        <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation type="unfinished"></translation>
+        <translation>Mercado Monetário</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
+        <translation>Fundos Mútuos</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished"></translation>
+        <translation>Outro</translation>
     </message>
     <message>
         <source>Bank:</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o nome do banco para esta despesa.</translation>
     </message>
     <message>
         <source>Account number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número de Conta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o número de conta para esta despesa.</translation>
     </message>
     <message>
         <source>PIN number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o PIN para esta despesa.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo Inicial:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o saldo inicial para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza informação adicional para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo Actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aqui poderá ver o saldo actual desta lista de despesas.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aqui poderá ver a lista de todas as transações introduzidas para esta lista de despesas.
+
+Para ordenar por um campo específico, clique no nome da coluna.</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição</translation>
     </message>
     <message>
         <source>Amount</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar uma transação.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione uma transação e clique aqui para a editar.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione uma transação e clique aqui para a apagar.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione o gráfico pretendido e clique no botão &quot;Gráfico&quot;.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher o gráfico desejado.</translation>
     </message>
     <message>
         <source>Account balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo da Conta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Levantamentos por categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
+        <translation>Depósitos por categoria</translation>
     </message>
     <message>
         <source>Draw</source>
-        <translation type="unfinished"></translation>
+        <translation>Gráfico</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para desenhar o gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar transação</translation>
     </message>
     <message>
         <source>Password protect</source>
-        <translation type="unfinished"></translation>
+        <translation>Proteger por palavra chave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para activar/desactivar a protecção por palavra chave.</translation>
     </message>
     <message>
         <source>Num</source>
-        <translation type="unfinished"></translation>
+        <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a sua palavra chave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirme palavra chave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Confirme a sua palavra chave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a sua palavra chave para desactivar a protecção:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar Despesas</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o símbolo monetário:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o símbolo monetário aqui.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra se as despesas estão protegidas 
+por palavra chave ou não</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar se a janela principal irá mostrar se as despesas estão protegidas por palavra chave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar saldos das despesas</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar se a janela principal irá mostrar o saldo actual de cada lista de despesas.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Despesas</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para criar uma nova lista de despesas.
+
+Também pode escolher &quot;Novo&quot; no menu.</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione uma lista de despesas e clique aqui para a editar.
+
+Também pode escolher &quot;Edit&quot; no menu, ou clicar e esperar num nome.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para apagar uma nova lista de despesas.
+
+Também pode escolher &quot;Apagar&quot; no menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Está é a lista de todas as listas de despesas disponíveis.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar lista de despesas</translation>
     </message>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para a configuração.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome da Despesa</translation>
     </message>
     <message>
         <source>Balance</source>
-        <translation type="unfinished"></translation>
+        <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a sua palavra chave:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
-        <translation type="unfinished"></translation>
+        <translation>Transação para</translation>
     </message>
     <message>
         <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
+        <translation>Levantamento</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione se a transação é um levantamento ou um depósito aqui.</translation>
     </message>
     <message>
         <source>Deposit</source>
-        <translation type="unfinished"></translation>
+        <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione a data da transação aqui.</translation>
     </message>
     <message>
         <source>Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o número do cheque aqui.</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a descrição da transação aqui.</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione a categoria da transação aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione o tipo de transação aqui.
+
+As opções são dependentes da transação ser de levantamento ou de depósito.</translation>
     </message>
     <message>
         <source>Amount:</source>
-        <translation type="unfinished"></translation>
+        <translation>Valor:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o valor da transação aqui.
+
+O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation type="unfinished"></translation>
+        <translation>Taxa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a taxa associada à transação.
+
+O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza informação adicional para esta transação aqui.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Automóvel</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation type="unfinished"></translation>
+        <translation>Contas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation type="unfinished"></translation>
+        <translation>CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Roupa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation type="unfinished"></translation>
+        <translation>Informática</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation type="unfinished"></translation>
+        <translation>DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation type="unfinished"></translation>
+        <translation>Entretenimento</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation type="unfinished"></translation>
+        <translation>Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation type="unfinished"></translation>
+        <translation>Combustível</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Vários</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation type="unfinished"></translation>
+        <translation>Filmes</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation type="unfinished"></translation>
+        <translation>Rendas</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation type="unfinished"></translation>
+        <translation>Viagens</translation>
     </message>
     <message>
         <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
+        <translation>Taxa de Débito</translation>
     </message>
     <message>
         <source>Written Check</source>
-        <translation type="unfinished"></translation>
+        <translation>Cheque</translation>
     </message>
     <message>
         <source>Transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Transferência</translation>
     </message>
     <message>
         <source>Credit Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão de Crédito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation type="unfinished"></translation>
+        <translation>Vencimento</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation type="unfinished"></translation>
+        <translation>Despesas Familiares</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
+        <translation>Créditos Diversos</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
+        <translation>Pagamento Automático</translation>
     </message>
     <message>
         <source>Cash</source>
-        <translation type="unfinished"></translation>
+        <translation>Dinheiro</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation>Electrónico</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/chess.ts b/i18n/pt/chess.ts
index 0ec5149..b9e2e55 100644
--- a/i18n/pt/chess.ts
+++ b/i18n/pt/chess.ts
@@ -1,56 +1,56 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BoardView</name>
     <message>
         <source>Could not find crafty chess engine</source>
-        <translation>Não foi encontrado o engine de xadrês &quot;crafty&quot; </translation>
+        <translation>Não foi encontrado o motor de xadrês &quot;crafty&quot; </translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Chess</source>
         <translation>Xadrês</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation>TextLabel1</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Position</source>
         <translation>Posição</translation>
     </message>
     <message>
         <source>ActionGroup</source>
         <translation>Grupo de acção</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>Swap sides</source>
         <translation>Mudar lados</translation>
     </message>
     <message>
         <source>Annotate game</source>
         <translation>Anotar jogo</translation>
     </message>
     <message>
         <source>Undo move</source>
         <translation>Voltar atrás</translation>
     </message>
     <message>
         <source>Action</source>
         <translation>Acção</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/clock.ts b/i18n/pt/clock.ts
index f69ddeb..398cfe6 100644
--- a/i18n/pt/clock.ts
+++ b/i18n/pt/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Toque</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Relógio</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Cronómetro</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Começar</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Definir Alarme</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Definir data e hora.</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarme Ligado</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarme Desligado</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Relógio: O alarme já passou.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>Alarme às: %1</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Definir Alarme</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Repetir o toque
 (minutos)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>Alarme MP3</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/confedit.ts b/i18n/pt/confedit.ts
index 31d2711..6d85e12 100644
--- a/i18n/pt/confedit.ts
+++ b/i18n/pt/confedit.ts
@@ -1,78 +1,78 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>EditWidget</name>
     <message>
         <source>File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do Ficheiro:</translation>
     </message>
     <message>
         <source>Group:</source>
         <translation>Grupo:</translation>
     </message>
     <message>
         <source>Key:</source>
         <translation>Tecla:</translation>
     </message>
     <message>
         <source>Value:</source>
         <translation>Valor:</translation>
     </message>
 </context>
 <context>
     <name>ListViewConfDir</name>
     <message>
         <source>Files</source>
         <translation>Ficheiros</translation>
     </message>
     <message>
         <source>Could not open</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível aceder</translation>
     </message>
     <message>
         <source>The directory </source>
         <translation>A directoria</translation>
     </message>
     <message>
         <source> could not be opened.</source>
         <translation>não pode ser acedida.</translation>
     </message>
 </context>
 <context>
     <name>ListViewItemConfFile</name>
     <message>
         <source>Could not open</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível abrir</translation>
     </message>
     <message>
         <source>The file </source>
         <translation>O ficheiro</translation>
     </message>
     <message>
         <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
+        <translation>não pode ser acedida.</translation>
     </message>
     <message>
         <source>no group</source>
-        <translation type="unfinished"></translation>
+        <translation>sem grupo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Configurações</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar</translation>
     </message>
     <message>
         <source>Revert</source>
-        <translation type="unfinished"></translation>
+        <translation>Reverter</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index dd57916..0e35fd5 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -1,810 +1,837 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Semanas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>A duração do evento é maior que o 
 intervalo entre as repetições.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar os dados enquanto está a sincronizar</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Editar Evento</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minutos)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>O calendário não conseguiu
 gravar as alterações.
 Liberte algum espaço e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconhecido)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erro!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Corrija-o</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Evento Duplicado</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>caixa de erro</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Te</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Qu</translation>
     </message>
     <message>
         <source>F</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sá</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicado</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>Irradiar esta ocorrência</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Início da vista de eventos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Hora de Início:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Alarme Pré-definido</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Estilo da Linha:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Largo</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Vista por omissão:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Semanas</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Ir para o dia actual</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Mostrar o dia</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Morada:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>STQQSSDS</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
+        <source>p</source>
+        <translation>p</translation>
+    </message>
+    <message>
+        <source>Mo</source>
         <comment>Monday</comment>
-        <translation>Se</translation>
+        <translation type="obsolete">Se</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>Te</translation>
+        <translation type="obsolete">Te</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>Qu</translation>
+        <translation type="obsolete">Qu</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>Qu</translation>
+        <translation type="obsolete">Qu</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>Se</translation>
+        <translation type="obsolete">Se</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>Sá</translation>
+        <translation type="obsolete">Sá</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>Do</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>p</translation>
+        <translation type="obsolete">Do</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Hora Início</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora Fim</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Morada</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Hora Início</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo o dia</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso horário</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencioso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>Informação</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos os %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>nd</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>rd</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>th</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>em</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Fim Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data de Fim</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>SemanaVar</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/dictionary.ts b/i18n/pt/dictionary.ts
index a4df6d7..eddd475 100644
--- a/i18n/pt/dictionary.ts
+++ b/i18n/pt/dictionary.ts
@@ -1,73 +1,73 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DictToolBase</name>
     <message>
         <source>MyDialog1</source>
-        <translation type="unfinished"></translation>
+        <translation>MeuDialogo1</translation>
     </message>
     <message>
         <source>All dictionaries</source>
         <translation>Todos os dicionários</translation>
     </message>
     <message>
         <source>Personal dictionary</source>
         <translation>Dicionário pessoal</translation>
     </message>
     <message>
         <source>System dictionary (English)</source>
         <translation>Dicionário de sistema (Inglês)</translation>
     </message>
     <message>
         <source>Selects the dictionary to manipulate.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o dicionário para manipular.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Pattern</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <source>Enter your search pattern here. You may use &lt;big&gt;&lt;tt&gt;?&lt;/tt&gt;&lt;/big&gt; to represent any one letter, &lt;big&gt;&lt;tt&gt;*&lt;/tt&gt;&lt;/big&gt; to represent zero or more arbitrary letters, or &lt;big&gt;&lt;tt&gt;[&lt;i&gt;abc&lt;/i&gt;]&lt;/tt&gt;&lt;/big&gt; to represent any one of the letters &lt;big&gt;&lt;tt&gt;&lt;i&gt;abc&lt;/i&gt;&lt;/tt&gt;&lt;/big&gt;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a procura aqui. Pode usar &quot;?&quot; para representar uma letra, &quot;*&quot; para representar zero ou mais letras ou &quot;[abc]&quot; para representar qualquer uma das letras &quot;a&quot;, &quot;b&quot; ou &quot;c&quot;.</translation>
     </message>
     <message>
         <source>Matches</source>
-        <translation type="unfinished"></translation>
+        <translation>Encontrado</translation>
     </message>
     <message>
         <source>Pickboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Quadro de Escolha</translation>
     </message>
     <message>
         <source>Letter sets</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de Letras</translation>
     </message>
     <message>
         <source>Enter sets of letters here, seperated by spaces in the same way as the sets of letters appear at the bottom of the Pickboard. The list below will show the largest sets of words that could be typed ambiguously. This information helps you tune the letter sets for your dictionary.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza a lista de letras aqui, separadas por espaços no mesmo formato que as letras que aparecem em baixo no Quadro de Escolha. A lista abaixo irá mostrar a melhor lista de palavras que poderão ser escritas com essas letras. Esta informação ajudar-lhe-á a escolher a lista de letras a usar para o dicionário.</translation>
     </message>
     <message>
         <source>Longest ambiguities</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambiguidade mais comprida</translation>
     </message>
     <message>
         <source>Edit words</source>
         <translation>Editar palavras</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>This dictionary is read-only.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este dicionário é apenas para leitura.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/drawpad.ts b/i18n/pt/drawpad.ts
index 5082675..e875aca 100644
--- a/i18n/pt/drawpad.ts
+++ b/i18n/pt/drawpad.ts
@@ -1,435 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Apagar Tudo</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Importar...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Exportar...</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Miniaturas</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Miniaturas...</translation>
     </message>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação da Página</translation>
     </message>
     <message>
         <source>Page Information...</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação da Página...</translation>
     </message>
     <message>
         <source>Tools</source>
-        <translation type="unfinished"></translation>
+        <translation>Ferramentas</translation>
     </message>
     <message>
         <source>New Page</source>
-        <translation type="unfinished">Nova Página</translation>
+        <translation>Nova Página</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpar Página</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Apagar Página</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Desfazer</translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Refazer</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Primeira Página</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Página Anterior</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Próxima Página</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Última Página</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Desenhar Ponto</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Desenhar Linha</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Desenhar Rectângulo</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Desenhar Rectângulo Preenchido</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Desenhar Elipse</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Desenhar Elipse Preenchida</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Inserir Texto</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Preencher Região</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Apagar Ponto</translation>
     </message>
     <message>
         <source>Pen Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Largura da Caneta</translation>
     </message>
     <message>
         <source>Pen Color</source>
-        <translation type="unfinished">Cor de Desenho</translation>
+        <translation>Cor da Caneta</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Cor Preenchimento</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer 
+limpar a página actual?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer 
+apagar a página actual?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
-        <translation type="unfinished">l</translation>
+        <translation>Tem a certeza que quer 
+apagar todas as páginas?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
+        <translation>Anti-Aliasing</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar uma página nova.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para limpar a página actual.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para apagar a página actual.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para desfazer a ultima acção.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para refazer a ultima acção.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para ver a primeira página.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para ver a última página.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para ver a próxima página.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para ver a página anterior.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para desenhar linhas.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para desenhar rectângulos.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para desenhar elipses.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para texto.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para preencher.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher uma ferramenta para apagar.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher a largura da caneta.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher a cor da caneta.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher a cor de preenchimento.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Página %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Exportar</translation>
     </message>
     <message>
         <source>Page Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccionar Páginas</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Actual</translation>
     </message>
     <message>
         <source>Range</source>
-        <translation type="unfinished"></translation>
+        <translation>Conjunto</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Para:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Exportar Como</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Formato:</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>Todas as Imagens</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Importar</translation>
     </message>
     <message>
         <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Previsão Automática</translation>
     </message>
     <message>
         <source>Preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Previsão</translation>
+    </message>
+    <message>
+        <source>All images</source>
+        <translation>Todas as Imagens</translation>
     </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nova Página</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largura:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Altura:</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Cor de Desenho</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Cor de Preenchimento</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação da Página</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Título:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Largura:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Altura:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Título: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensão: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Data: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
-        <translation type="unfinished">Inserir Texto</translation>
+        <translation>Insira Texto</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Vista de Miniaturas</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Limpar Página</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer
+limpar a página actual?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Apagar Página</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer
+apagar a página seleccionada?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar uma página nova.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para limpar a página actual.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para apagar a página actual.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mover a página actual uma posição acima.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mover a página actual uma posição abaixo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index a10b696..0b4392a 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -1,217 +1,217 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção do Comando</translation>
     </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos&lt;/b&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>Micro</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>Pastas em Baixo</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>Preto em Transparente</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>Preto em Vermelho</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>Vermelho em Preto</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta em Azul</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>Ciano em Branco</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>Branco em Ciano</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
-        <translation>Ambar em Preto</translation>
+        <translation>Âmbar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fontes</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>Barra</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizado</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>Lista de Comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Quebra</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usar Som</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation>Tabs em Cima</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>Selecção de Comandos</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>Adicionar comando</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>Comando a adicionar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/euroconv.ts b/i18n/pt/euroconv.ts
index 4eb9e18..d0bdfb8 100644
--- a/i18n/pt/euroconv.ts
+++ b/i18n/pt/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>Conversor Euros</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/filebrowser.ts b/i18n/pt/filebrowser.ts
deleted file mode 100644
index a7e2016..0000000
--- a/i18n/pt/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/formatter.ts b/i18n/pt/formatter.ts
index 751e732..b1cc3a6 100644
--- a/i18n/pt/formatter.ts
+++ b/i18n/pt/formatter.ts
@@ -1,161 +1,180 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatar Cartão</translation>
     </message>
     <message>
         <source>Storage Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de Armazenamento</translation>
     </message>
     <message>
         <source>File Systems</source>
-        <translation type="unfinished"></translation>
+        <translation>Sistemas de Ficheiros</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatar</translation>
     </message>
     <message>
         <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
+        <translation>Principal</translation>
     </message>
     <message>
         <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Lista de Sistemas de Ficheiros (fstab)</translation>
     </message>
     <message>
         <source>Check Disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Verificar Cartão</translation>
     </message>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Mount Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Directoria de Acesso</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
+        <translation>Avançado</translation>
     </message>
     <message>
         <source>Really format
 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatar mesmo
+</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível formatar.
+Tipo desconhecido</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultado da Formatação</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
+        <translation>A tentar desmontar.</translation>
     </message>
     <message>
         <source>umount failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>falhou a desmontar!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível desmontar.
+O dispositivo está a ser usado!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
+        <translation>A tentar formatar.</translation>
     </message>
     <message>
         <source>No such device!</source>
-        <translation type="unfinished"></translation>
+        <translation>Não existe o dispositivo!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
+        <translation>
+foi formatado com sucesso.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou ao montar o cartão!</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pode fechar a janela de resultado.</translation>
     </message>
     <message>
         <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
+        <translation>Interno</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Total: %1 KB (%d MB)
+</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Usado: %1 KB (%d MB)
+</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
+        <translation>Disponível: %1 KB (%d MB)</translation>
+    </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>ATENÇÃO:
+Alterações de parametros nesta
+página poderão provar o mau
+funcionamento do sistema!</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>Formatar?</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>com o sistema de ficheiros %1?
+Perderá todos os dados!</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>A tentar desmontar %1.</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>A tentar montar %1.</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>%1
+foi montado com sucesso.</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>Tipo de Armazenamento: %1</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>Tipo: %1
+Formatado com %2
+%3, %4, %5</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/helpbrowser.ts b/i18n/pt/helpbrowser.ts
index 63b9d26..7ae776a 100644
--- a/i18n/pt/helpbrowser.ts
+++ b/i18n/pt/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Trás</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Frente</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Adicionar Atalho</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Apagar dos Atalhos</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Atalhos</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Menu de Ajuda</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>MenuAjuda</translation>
+        <source>Go</source>
+        <translation>Ir</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/kbill.ts b/i18n/pt/kbill.ts
index 9efb28a..9c4aadc 100644
--- a/i18n/pt/kbill.ts
+++ b/i18n/pt/kbill.ts
@@ -1,64 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>kBill</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>Novo jogo</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>Pausar jogo</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>História do kBill</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regras</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pausar Jogo</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;A História&lt;/b&gt;&lt;p&gt;Mais uma vez, o destino do mundo está nas suas mãos! Um hacker malicioso, conhecido apenas pela alcunha &apos;Bill&apos;, criou o mais perigoso vírus informático. Um vírus tão malicioso que é capaz de transformar um computador normal numa torradeira. Para piorar, o &apos;Bill&apos; clonou-se em biliões de micro-Bills, onde o propósito de cada um é apenas a infestação do tal vírus. O vírus foi disfarçado como um sistema operativo popular. Como administrador de sistemas e exterminador, o seu objectivo é evitar o sucesso do &apos;Bill&apos; nesta tarefa.</translation>
     </message>
     <message>
         <source>The story of KBill</source>
         <translation>A história do kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>As regras do kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;As Regras&lt;/b&gt;&lt;p&gt;O kBill foi cuidadosamente desenhado e desenvolvido de forma a ser facilmente usado pela família toda, incluíndo a pequena Sally. Anos - quer dizer - dias de testes e consultoria pelos designers mais baratos de interfaces humanas resultaram num jogo fácil de usar, ainda que não tão fácil como um Macintosh.&lt;p&gt;&lt;ul&gt;&lt;li&gt;Mate os Bills (clique neles)&lt;/li&gt;&lt;li&gt;Reinicie os computadores (clique neles)&lt;/li&gt;&lt;li&gt;Pegue nos sistemas trocados e retorne-os ao computador (arraste-os)&lt;/li&gt;&lt;li&gt;Arraste os baldes para estinguir os fogos&lt;/li&gt;&lt;li&gt;A pontuação é baseada no tempo que aguentar, com bónus por cada Bill morto.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Quanto ao resto, provavelmente conseguirá descobrir por si próprio. Nós conseguimos, portanto não deve ser assim tão difícil</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>Nível Seguinte</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>Pontuação</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/kcheckers.ts b/i18n/pt/kcheckers.ts
index ebf2980..2b675ab 100644
--- a/i18n/pt/kcheckers.ts
+++ b/i18n/pt/kcheckers.ts
@@ -1,129 +1,129 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KCheckers</name>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Novo</translation>
     </message>
     <message>
         <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Desfazer Jogada</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sair</translation>
     </message>
     <message>
         <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Iniciante</translation>
     </message>
     <message>
         <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Novato</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Médio</translation>
     </message>
     <message>
         <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bom</translation>
     </message>
     <message>
         <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Conhecedor</translation>
     </message>
     <message>
         <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mestre</translation>
     </message>
     <message>
         <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mostrar Numeração</translation>
     </message>
     <message>
         <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Regras &amp;Inglesas</translation>
     </message>
     <message>
         <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Regras &amp;Russas</translation>
     </message>
     <message>
         <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabuleiro &amp;Verde</translation>
     </message>
     <message>
         <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabuleiro &amp;Mármore</translation>
     </message>
     <message>
         <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabuleiro de &amp;Madeira</translation>
     </message>
     <message>
         <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
+        <translation>O que é isto</translation>
     </message>
     <message>
         <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Regras do Jogo</translation>
     </message>
     <message>
         <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Acerca do Xâdres</translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
+        <translation>Acerca da &amp;Qt</translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nível</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opções</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <source> New Game </source>
-        <translation type="unfinished"></translation>
+        <translation>Novo Jogo</translation>
     </message>
     <message>
         <source> Undo Move </source>
-        <translation type="unfinished"></translation>
+        <translation>Desfazer Jogada</translation>
     </message>
     <message>
         <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
+        <translation>Regras do Jogo</translation>
     </message>
     <message>
         <source>Go!</source>
-        <translation type="unfinished"></translation>
+        <translation>Começar!</translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
+        <translation>Parabéns! Ganhou o jogo!</translation>
     </message>
     <message>
         <source>Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Espere um momento...</translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
+        <translation>Perdeu. Fim de jogo.</translation>
     </message>
     <message>
         <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jogada incorrecta.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index 5ddff59..1288571 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -1,288 +1,290 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KRFBConnection</name>
     <message>
         <source>Connected</source>
         <translation>Ligado</translation>
     </message>
     <message>
         <source>Connection Refused</source>
         <translation>Ligação Recusada</translation>
     </message>
     <message>
         <source>Host not found</source>
         <translation>Endereço não encontrado</translation>
     </message>
     <message>
         <source>Read Error: QSocket reported an error reading
 data, the remote host has probably dropped the
 connection.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao ler os dados.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro desconhecido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera da inicialização do servidor...</translation>
     </message>
     <message>
         <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera do nome do ambiente de trabalho...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro de Protocolo: recebida a mensagem %1 em vez de uma actualização.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro de Protocolo: o servidor %1 usou uma codificação desconhecida </translation>
     </message>
 </context>
 <context>
     <name>KRFBLogin</name>
     <message>
         <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
+        <translation>À espera da versão do servidor...</translation>
     </message>
     <message>
         <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: versão do servidor inválida, %1</translation>
     </message>
     <message>
         <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: versão do servidor não suportada, %1</translation>
     </message>
     <message>
         <source>Logged in</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticado em</translation>
     </message>
     <message>
         <source>Error: This server requires a password, but none has been specified.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: este servidor necessita de palavra chave, mas não foi especificada nenhuma.
+</translation>
     </message>
     <message>
         <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: a palavra chave especificada é incorrecta.</translation>
     </message>
     <message>
         <source>Error: Too many invalid login attempts have been made
 to this account, please try later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: demasiadas tentativas inválidas de autenticação 
+para esta conta, tente mais tarde.</translation>
     </message>
     <message>
         <source>Login Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticação Falhou</translation>
     </message>
     <message>
         <source>Too many failures</source>
-        <translation type="unfinished"></translation>
+        <translation>Demasiadas falhas de autenticação</translation>
     </message>
 </context>
 <context>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliente VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar</translation>
     </message>
     <message>
         <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Sair de Ecrâ Todo</translation>
     </message>
     <message>
         <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligar ao servidor remoto</translation>
     </message>
     <message>
         <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado ao servidor remoto</translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação terminada</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova Ligação</translation>
     </message>
     <message>
         <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir Atalho</translation>
     </message>
     <message>
         <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar Atalho</translation>
     </message>
     <message>
         <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar Control-Alt-Del</translation>
     </message>
     <message>
         <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo Clique é Duplo Clique</translation>
     </message>
     <message>
         <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo Clique é Clique Direito</translation>
     </message>
 </context>
 <context>
     <name>KVNCBookmarkDlgBase</name>
     <message>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalhos</translation>
     </message>
     <message>
         <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o atalho que deseja abrir</translation>
     </message>
 </context>
 <context>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação do Cliente VNC</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor</translation>
     </message>
     <message>
         <source>Show Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar palavra Chave</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do Atalho:</translation>
     </message>
     <message>
         <source>Host Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor:</translation>
     </message>
     <message>
         <source>Display Number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Número do Ecrâ:</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar ecrâ cada:</translation>
     </message>
     <message>
         <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Mili-segundos</translation>
     </message>
     <message>
         <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
+        <translation>Pedir sessão de 256 cores</translation>
     </message>
     <message>
         <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
+        <translation>Primeiro Plano quando tocar</translation>
     </message>
     <message>
         <source>Request shared session</source>
-        <translation type="unfinished"></translation>
+        <translation>Pedir sessão partilhada</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
     <message>
         <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Factor de Escala</translation>
     </message>
     <message>
         <source>Encodings</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificações</translation>
     </message>
     <message>
         <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;Hextile&quot;</translation>
     </message>
     <message>
         <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;CoRRE&quot;</translation>
     </message>
     <message>
         <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;RRE&quot;</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Codificação &quot;Copy Rectangle&quot;</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>A palavra chave do servidor VNC</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
+        <translation>Esconder/mostrar a palavra chave</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome do servidor VNC</translation>
     </message>
     <message>
         <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome de rede do servidor VNC </translation>
     </message>
     <message>
         <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>O número de ecrâ do servidor VNC</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervalo de actualização </translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa apenas 256 cores</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Permite várias ligações simultâneas ao servidor VNC</translation>
     </message>
     <message>
         <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar o ecrâ remoto para caber no ecrâ do dispositivo (lento)</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar a transmissão de rectangulos semelhantes como referência dos dados existentes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/kpacman.ts b/i18n/pt/kpacman.ts
index fb73268..0a8fa97 100644
--- a/i18n/pt/kpacman.ts
+++ b/i18n/pt/kpacman.ts
@@ -1,232 +1,246 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Omissão</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar teclas de direcção</translation>
     </message>
     <message>
         <source>Undefined key</source>
-        <translation type="unfinished"></translation>
+        <translation>Tecla indefinida</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Novo</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Parar</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pontuações</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sair</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Esconder cursor do rato</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Escolher o esquema gráfico</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Parar quando não estiver em primeiro plano</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Continua quando estiver em primeiro plano</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar &amp;teclas...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>@PACKAGE@ - @VERSION@
+
+Joerg Thoennissen (joe@dsite.de)
+
+Um jogo do tipo PacMan para o ambiente Opie
+
+Este programa é baseado no código fonte do ksnake,
+por Michel Filippi (mfilippi@sade.rhein-main.de).
+O design é altamente influenciado pelo jogo pacman
+(c) 1980 MIDWAY MFG.CO.
+
+Gostaria de agradecer à minha namorada Elke Krueers for
+pelos ultimos dez anos de amizade.
+</translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ajuda</translation>
     </message>
     <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
+        <source>KPacman</source>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível usar a fonte necessária.
+
+O ficheiro &apos;@FONTNAME@&apos; não existe ou
+tem um formato desconhecido.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
+        <translation>FIM DE JOGO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
+        <translation>JOGADOR UM</translation>
     </message>
     <message>
         <source>READY!</source>
-        <translation type="unfinished"></translation>
+        <translation>PREPARADO!</translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PARADO</translation>
     </message>
     <message>
         <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
+        <translation>CARACTÉR</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished"></translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
+        <translation>ALCUNHA</translation>
     </message>
     <message>
         <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
+        <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
+        <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
+        <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
-        <translation type="unfinished"></translation>
+        <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
+        <translation>Adaptação para o Opie: Catalin Climov</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
+        <translation>Prima a tecla de cursor para começar</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
-        <translation type="unfinished"></translation>
+        <translation>1 JOGADOR</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
+        <translation>MELHOR PONTUAÇÃO</translation>
     </message>
     <message>
         <source>  2UP </source>
-        <translation type="unfinished"></translation>
+        <translation>2 JOGADORES</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
+        <translation>    PARABÉNS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
+        <translation>    CONSEGUIU ATINGIR</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
+        <translation> UMA PONTUAÇÃO NOS DEZ MELHORES.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
+        <translation>POS   PONTU  NOME   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
-        <translation type="unfinished"></translation>
+        <translation>PARADO</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
+        <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation type="unfinished"></translation>
+        <translation>                          </translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível usar o gráfico necessário.
+
+O ficheiro &apos;@PIXMAPNAME@&apos; não existe ou
+tem um formato desconhecido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/launchersettings.ts b/i18n/pt/launchersettings.ts
index d6ee0ff..15a58ea 100644
--- a/i18n/pt/launchersettings.ts
+++ b/i18n/pt/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações da Lista de Aplicações</translation>
     </message>
     <message>
         <source>Taskbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra Principal</translation>
     </message>
     <message>
         <source>O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu Principal</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastas</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ler aplicações especiais no menu principal:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar pastas de aplicações no menu principal</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione as aplicações especiais que quer incluidas no menu principal.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiciona as pastas de aplicações ao menu principal.</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Exemplo 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Exemplo 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Exemplo 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Pasta</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Fundo</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonte</translation>
     </message>
     <message>
         <source>Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Icones</translation>
     </message>
     <message>
         <source>Previewing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>A mostrar previsão %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é uma precisão simples do formato de pastas seleccionado.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar uma fonte personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <source>Ruled</source>
-        <translation type="unfinished"></translation>
+        <translation>Riscas</translation>
     </message>
     <message>
         <source>Solid color</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagem</translation>
     </message>
     <message>
         <source>Select...</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione...</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Omissão</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho:</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Pequena</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pastas de Aplicações:</translation>
     </message>
     <message>
         <source>foobar</source>
-        <translation type="unfinished"></translation>
+        <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar indicador grande ao iniciar uma aplicação</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar indicador a piscar ao iniciar uma aplicação</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione a pasta de aplicações que quer editar ou apagar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiciona uma nova pasta à lista de aplicações.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Abre uma nova janela para personalizar a pasta seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar a pasta da lista de aplicações.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Active esta opção se quiser um indicador grande no meio do ecrâ em vez de um na barra principal.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Active esta opção se quiser um indicador a piscar ao iniciar aplicações.</translation>
     </message>
     <message>
         <source>All Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Todas as Pastas</translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Por implementar</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregar aplicações especiais na barra principal:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione as aplicações especiais que deseja ver na barra principal.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libfreetypefactory.ts b/i18n/pt/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pl/libfreetypefactory.ts
+++ b/i18n/pt/lib.ts
diff --git a/i18n/pt/libclockapplet.ts b/i18n/pt/libclockapplet.ts
index 4eb9e18..9436662 100644
--- a/i18n/pt/libclockapplet.ts
+++ b/i18n/pt/libclockapplet.ts
@@ -1,2 +1,15 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Information</source>
+        <translation type="obsolete">Informação</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="obsolete">&lt;p&gt;A data do sistema não parece válida.
+(%1)&lt;/p&gt;&lt;p&gt;Deseja corrigi-la?&lt;/p&gt;</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libdialup.ts b/i18n/pt/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/pt/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/libflatstyle.ts b/i18n/pt/libflatstyle.ts
index 4eb9e18..6e69a24 100644
--- a/i18n/pt/libflatstyle.ts
+++ b/i18n/pt/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>Plano</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libhomeapplet.ts b/i18n/pt/libhomeapplet.ts
index 8c29dd8..cd0bd30 100644
--- a/i18n/pt/libhomeapplet.ts
+++ b/i18n/pt/libhomeapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
         <translation>Atalho para o início</translation>
     </message>
     <message>
         <source>Desktop</source>
-        <translation>Desktop</translation>
+        <translation>Ambiente de Trabalho</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libinterfaces.ts b/i18n/pt/libinterfaces.ts
index 407ea1f..a585e4e 100644
--- a/i18n/pt/libinterfaces.ts
+++ b/i18n/pt/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação Avançada da Interface</translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation type="unfinished"></translation>
+        <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço IP</translation>
     </message>
     <message>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Máscara de Sub-Rede</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação DHCP</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor DHCP</translation>
     </message>
     <message>
         <source>Lease Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Expiração do Endereço</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço Obtido em</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço MAC</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação da Interface</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Relêr</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Parar</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
+        <translation>R&amp;einiciar</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Iniciar</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Máscara de Sub-Rede</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço MAC</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ver Informação Avançada</translation>
+    </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation>modo &amp;silencioso</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração da Interface</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar automaticamente</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração de endereço IP estático</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Máscara de Sub-Rede</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Primeiro DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço IP</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Segundo DNS</translation>
+    </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation>255.255.255.0</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar Interface</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libirdaapplet.ts b/i18n/pt/libirdaapplet.ts
index cd40d09..a20b588 100644
--- a/i18n/pt/libirdaapplet.ts
+++ b/i18n/pt/libirdaapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
-        <translation>Devices Descobertos:</translation>
+        <translation>Dispositivos Descobertos:</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
         <translation>Desligar IrDA</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
         <translation>Ligar IrDA</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
         <translation>Desligar Descobrir</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
         <translation>Ligar Descobrir</translation>
     </message>
     <message>
         <source>Disable Receive</source>
         <translation>Desligar Receber</translation>
     </message>
     <message>
         <source>Enable Receive</source>
         <translation>Ligar Receber</translation>
     </message>
     <message>
         <source>Found:</source>
         <translation>Encontrado:</translation>
     </message>
     <message>
         <source>Lost:</source>
         <translation>Perdido:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libkppp.ts b/i18n/pt/libkppp.ts
new file mode 100644
index 0000000..b7bcdc9
--- a/dev/null
+++ b/i18n/pt/libkppp.ts
@@ -0,0 +1,1492 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="obsolete">&amp;Editar...</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation>Permite modificar a conta selecionada</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="obsolete">&amp;Novo...</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation>Criar uma nova ligação à internet
+via modem</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="obsolete">Co&amp;piar</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation>Cria uma cópia da conta selecionada. 
+Serão copiados todos os valores da conta,
+que poderá modificar</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="obsolete">&amp;Apagar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Apaga a conta selecionada&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Maximum number of accounts reached.</source>
+        <translation type="obsolete">Atinjido o máximo de contas.</translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation>Nenhuma conta selecionada.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation>Tem a certeza que quer apagar
+a conta &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Confirmar</translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation>Nova Conta</translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation>Editar Conta:</translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation>Ligar</translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation>Editar script da ligação</translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation>Autenticação</translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation>Configurar IP</translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation>IP</translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation>Configurar Gateway</translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation>Gateway</translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation>Configurar DNS</translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation>DNS</translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation>Executar Programa</translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation>Executar</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation>O nome da conta tem de ser único</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="obsolete">Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="obsolete">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="obsolete">GB</translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation>Autenticação:</translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation>Baseado em script</translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation>PAP</translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation>Baseado em terminal</translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation>CHAP</translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation>PAP/CHAP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation>&lt;p&gt;Especifica o método a usar para ser identificado na 
+ligação. As universidades usam geralmente autenticação
+baseada em terminal ou script, mas a maioria dos ISP&apos;s 
+usam PAP ou CHAP. Em caso de dúvida, contacte o seu ISP.
+
+Se puder escolher entre PAP e CHAP, escolha CHAP porque
+é mais seguro. Se não souber qual a escolher, tente 
+PAP/CHAP.
+</translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation>Utilizador:</translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation>Introduza o utilizador aqui...</translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation>Palavra Chave:</translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation>Introduza a palavra chave aqui</translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation>Guardar palavra chave</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation>&lt;p&gt;Se activar esta opção, a palavra chave será 
+guardada no ficheiro de configuração do 
+&lt;i&gt;kppp&lt;/i&gt;, para que não a tenha de introduzir 
+sempre que liga.
+
+&lt;b&gt;Atenção: a palavra chave será guardada em 
+texto, e só pode ser lida por si!</translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation>erro</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation>&lt;qt&gt;O script de ligação tem um erro nos Start e End&lt;/qt&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation>&amp;Editar...</translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation>&amp;Novo...</translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation>Co&amp;piar</translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation>&amp;Apagar</translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation>Nome do domínio:</translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation>Se escolher um nome de domínio aqui, será usado
+enquanto estiver ligado. Ao desligar, será reposto o 
+nome de domínio anterior.</translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation>Configuração:</translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation>Automática</translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation>Manual</translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation>Endereço IP do DNS:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation>&lt;p&gt;Permite-lhe escolher um servidor DNS a ser
+usado durante a ligação. Quando a ligação for 
+terminada, a entrada do DNS será removida.
+
+Para adicionar um servidor DNS, introduza aqui o 
+endereço IP e clique em &lt;b&gt;Adicionar&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation>Clique aqui para adicionar o servidor 
+DNS especificado no campo acima. 
+A entrada será adicionada na lista abaixo </translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation>Clique neste botão para remover o servidor DNS 
+selecionado na lista abaixo</translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation>Lista de endereços DNS:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation>&lt;p&gt;Aqui serão mostrados os servidores DNS a serem
+usados durante a ligação. Use a opção &lt;b&gt;Adicionar&lt;/b&gt;
+e &lt;b&gt;Remover&lt;/b&gt; para modificar a lista</translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation>Desactivar servidores DNS durante a ligação</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation>&lt;p&gt;Quando esta opção for selecionada, todos os 
+servidores DNS especificados no ficheiro &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt;
+serão temporariamente desactivados durante o
+tempo da ligação. Quando a ligação terminar, esses
+valores serão repostos.
+
+Geralmente esta opção é desnecessária. 
+Use esta opção apenas se necessitar dela.</translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="obsolete">Permite modificar a conta selecionada</translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="obsolete">Criar uma nova ligação à internet
+via modem</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="obsolete">Cria uma cópia da conta selecionada. 
+Serão copiados todos os valores da conta,
+que poderá modificar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="obsolete">&lt;p&gt;Apaga a conta selecionada&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>No devices selected.</source>
+        <translation>Nenhum dispositivo selecionado.</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation>Tem a certeza que deseja remover
+o dispositivo &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation>Confirmar</translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation>Novo Dispositivo</translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation>Editar Dispositivo:</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation>&amp;Dispositivo</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation>&amp;Modem</translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="obsolete">O nome da conta tem de ser único</translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation>Permite modificar o dispositivo selecionado</translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation>Criar um dispositivo novo</translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation>Cria uma cópia do dispositivo selecionado. 
+Serão copiadas todas as configurações para o
+novo, que poderão ser modificadas</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation>&lt;p&gt;Apaga a conta selecionada&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation>O nome do dispositivo tem de ser único</translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation>Nome da ligação:</translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation>Escolha um nome unico para esta ligação</translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation>Número de telefone:</translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation>&amp;Adicionar...</translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation>&amp;Remover</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation>&lt;p&gt;Especifique o número de telefone a ligar.
+Poderá escolher vários números, bastando 
+adicioná-los na opçao &quot;Adiciona&quot;. Pode 
+ordená-los com as setas.
+
+Quando um número está ocupado, o &lt;i&gt;kppp&lt;/i&gt;
+irá tentar o número seguinte</translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation>Personalizar os argumentos do pppd...</translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation>Aqui poderá escolher os comandos a executar em determinadas fases da ligação. Estes comandos serão executados com o seu utilizador, portanto não poderá executar comandos que necessitem de permissões de &quot;root&quot; (a menos que seja root, obviamente).&lt;br&gt;&lt;br&gt;Certifique-se que introduz o caminho completo para o programa para garantir que ele é encontrado.</translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation>Antes de ligar:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation>Permite a execução de um programa &lt;b&gt;antes&lt;/b&gt; da ligação
+ser estabelecida. Será executada imediatamente antes da
+ligação propriamente dita.</translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation>Depois de ligar:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation>Permite a execução de um programa &lt;b&gt;depois&lt;/b&gt; da ligação
+ser estabelecida. Será executada quando a ligação à Internet 
+estiver concluída.
+
+Pode ser usado por examplo para aceder automaticamente ao mail </translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation>Antes de desligar:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation>Permite a execução de um programa &lt;b&gt;antes&lt;/b&gt; da ligação
+ser terminada. A ligação será mantida até que este programa
+termine.</translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation>Depois de desligar:</translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation>Permite a execução de um programa &lt;b&gt;depois&lt;/b&gt; da 
+ligação ser fechada.</translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuração</translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation>Gateway por omissão</translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation>Esta opção irá usar o seu ISP como Gateway para 
+todos os pacotes que não sejam da sua rede local.
+
+Isto é o usual para a maioria dos ISP&apos;s, portanto é 
+recomendado que active esta opção.</translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation>Gateway estática</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation>&lt;p&gt;Permite especificar qual o IP que deseja usar como
+Gateway (veja &lt;i&gt;Gateway por omissão&lt;/i&gt; acima)</translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation>Endereço IP da Gateway:</translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation>Assigna este IP como Gateway</translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation>Se esta opção estiver activa, todos os pacotes
+que não sejam para a rede local serão routeados
+através da ligação PPP.
+
+Normalmente deverá activar esta opção</translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation>Configuração</translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation>Endereço IP dinâmico</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation>Escolha esta opção para que o seu dispositivo
+receba um IP do seu ISP quando é estabelecida
+uma ligação.
+
+Practicamente todos os ISP&apos;s usam este método,
+portanto é recomendado activar esta opção.</translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation>Endereço IP estático</translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation>Escolha esta opção quando desejar fixar o seu
+IP. Na maioria dos casos, é o ISP que envia o seu
+IP, portanto active esta opção apenas se tiver a 
+certeza do que está a fazer.</translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation>Endereço IP:</translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation>Se o seu dispositivo tiver uma IP fixo, introduza-o
+aqui.</translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation>Máscara da sub-rede:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation>&lt;p&gt;Se o seu dispositivo tiver um endereço IP fixo, 
+deverá introduzir uma máscara de rede aqui. Na maioria
+dos casos, será &lt;b&gt;255.255.255.0&lt;/b&gt;.
+
+Em caso de dúvida, consulte o seu ISP</translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation>Configurar automaticamente o nome para este IP</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation>&lt;p&gt;Quando efectuar a ligação, esta opção irá
+reconfigurar o nome do dispositivo para que 
+corresponda ao IP recebido na ligação.
+Isto poderá ser útil no caso de usar um protocolo
+que dependa desta informação, mas também
+poderá causar vários problemas.
+
+Não active esta opção a menos que precise dela.</translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation>A escolha desta opção poderá causar vários problemas estranhos com o servidor X ou outras aplicações durante a ligação. Não a use a menos que tenha a certeza do que está a fazer.</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation>Atenção</translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation>Sem palavra chave</translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation>Palavra chave vazia, tem de introduzir uma</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation>&amp;Nome do Modem:</translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation>Dispositi&amp;vo do Modem:</translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation>Aqui deverá especificar a porta série onde o seu modem
+está instalado. No Linux/x86, o nome é tipicamente 
+/dev/ttyS0 (COM1 no DOS) ou /dev/ttyS1 (COM2 no DOS).
+
+Se possuir uma carta ISDN interna com emulação de
+comandos AT (a maioria das cartas suportam isto em Linux), 
+deverá ter um nome do estilo /dev/ttyIx.</translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation>Controlo de &amp;Flow:</translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation>Hardware [CRTSCTS]</translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation>Software [XON/XOFF]</translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation>Nenhum</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation>&lt;p&gt;Especifica o controlo de &quot;Flow&quot; entre a porta
+série e o modem. Não deverá alterar este valor a
+menos que saiba o que está a fazer.
+
+&lt;b&gt;Omissão&lt;/b&gt;: CRTSCTS</translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation>Terminação de &amp;linha:</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation>&lt;p&gt;Especifica quais os caracteres de terminação de linha
+a serem enviados para o seu modem. A maioria dos modems
+funcionam correctamente com o valor por omissão &lt;i&gt;CR/LF&lt;/i&gt;.
+Se o seu modem não reagir correctamente à string de inicialização,
+tente valores diferentes aqui
+
+&lt;b&gt;Omissão&lt;/b&gt;: CR/LF</translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation>&amp;Velocidade de ligação:</translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation>Especifica a velocidade entre o modem e a porta série.
+Deverá começar por tentar o valor por omissão de 38.400 
+bits/seg. Se funcionar, tente aumentar o valor até ao 
+máximo de 115.200 bits/sec, a menos que a sua porta
+série e o modem suportem velocidades mais elevadas.</translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation>&amp;Usar ficheiro de bloqueio</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Para evitar que vários programas usem a porta
+série quando estiver a decorrer uma ligação, poderá ser
+criado um ficheiro de bloqueio que indicará que o 
+modem está a ser usado. Num sistema Linux, o ficheiro
+será da forma &lt;tt&gt;/var/lock/LCK..ttySx&lt;/tt&gt;.
+Aqui poderá activar ou desactivar o uso desse ficheiro.
+
+&lt;b&gt;Omissão&lt;/b&gt;: Ligado</translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation>Tempo de inactividade da ligação:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>seg</translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation>Aqui pode especificar o tempo de espera por uma resposta
+de &lt;i&gt;CONNECT&lt;/i&gt; vinda do modem. O valor recomendado
+é de 30 segundos.</translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation>Ocupado:</translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation>&amp;Esperar por sinal de ligação antes de ligar</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation>&lt;p&gt;Normalmente, o modem espera que haja um sinal 
+de ligação na linha telefónica, indicando que é possível
+começar a marcação do número. Se o seu modem não 
+reconhecer o sinal ou no caso do sistema telefónico não
+disponibilizar esse sinal, desactive esta opção.
+
+&lt;b&gt;Omissão&lt;/b&gt;: Ligado
+</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>seg</translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation>Especifica o número de segundos a esperar antes de
+voltar a tentar ligar no caso de todos os números estarem
+ocupados. Esta opção é necessária devido a alguns modems
+ficarem encravados no caso de um número estar ocupado
+muitas vezes.
+
+O valor por omissão é de 0 segundos, e não deverá alterar
+a menos que precise.</translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation>&amp;Volume do Modem:</translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation>A maioria dos modems têm uma coluna que fará
+muito barulho ao estabelecer a ligação. Aqui poderá
+desactivar esse som ou dimimuir o volume dele.
+
+Se esta opção não funcionar com o seu modem, 
+deverá alterar o comando de configuração do volume.</translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation>Modem verifica a linha CD</translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation>Isto controla a forma do &lt;i&gt;kppp&lt;/i&gt; detectar se o modem
+não está a responder. A menos que tenha problemas com esta
+opção, não deverá alterá-la.
+
+&lt;b&gt;Omissão&lt;/b&gt;: Desligada</translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation>Comandos do Mod&amp;em...</translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation>Permite alterar os comandos AT para o seu
+modem.</translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation>&amp;Questionar o Modem...</translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation>A maioria dos modems suportam os comandos ATI para
+questionar a marca, model e versão do seu modem.
+
+Use esta opção para questionar esta informação ao seu 
+modem. Esta informação poderá ser útil para configurar
+o seu modem</translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation>Configurar Modem</translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation>Falha no modem</translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation>Ocorreu um erro crítico durante o teste ao modem</translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation>&amp;Contas</translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="obsolete">&amp;Dispositivo</translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="obsolete">&amp;Modem</translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation>&amp;Dispositivos</translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation>Personalziar os argumentos do pppd</translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation>Argumentos:</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Por Omissão</translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation>Adicionar Número de Telefone</translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation>Introduza o número de telefone:</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation>PPP</translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation>dispositivo ppp genérico</translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation>Não foi possível aceder ao modem.</translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation>Não foi possível detectar o estado da linha CD.</translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation>O modem não está pronto.</translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation>O modem está ocupado.</translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation>Modem Pronto.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation>Não foi possível restaurar as configurações do tty: tcsetattr()
+</translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation>O modem não está a responder.</translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation>Velocidade desconhecida</translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation>Questionar ATI</translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation>Não foi possível criar o ficheiro de bloqueio do modem.</translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation>A procurar o modem...</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation>Expirou o tempo para questionar o modem.</translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation>O dispositivo do modem está bloqueado.</translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation>Modem Pronto</translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation>Um momento...</translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation>Resultados do Questionário ao Modem</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation>Não tem permissões para fazer uma ligação 
+através do kppp. Contacte o seu administrador.</translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation>Não foi possível encontrar o processo de PPP!
+Certifique-se que tem o pppd instalado.</translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation>Não tem permissões para executar o pppd!
+Contacte o seu administrador e peça acesso ao pppd.</translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation>Não tem permissões suficiente para executar
+%1
+Certifique-se que o kppp é do root e tem o bit de SUID activado.</translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation>Não foi encontrado ou não é possível ler %1!
+Peça ao administrador para criar este ficheiro (mesmo que seja vazio) com as permissões de leitura e escrita correctas.</translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation>Editar Comandos do Modem</translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation>Espera antes da inicialização (seg/100):</translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation>String de inicialização %1:</translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation>Espera depois da inicialização (seg/100):</translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation>Velocidade de marcação (seg/100):</translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation>Resposta da inicialização:</translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation>Deteção de falta de sinal de ligação:</translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation>String de marcação:</translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation>Resposta ao ligar:</translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation>Resposta se ocupado:</translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation>Resposta se não tiver ligação:</translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation>Resposta se não tiver sinal de marcar:</translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation>String para desligar:</translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation>Resposta ao desligar:</translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation>String para atender:</translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation>Resposta se tocar:</translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation>Resposta se atender:</translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation>String de escape:</translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation>Resposta de escape:</translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation>Tempo de salvaguarda (seg/50):</translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation>Volume desligado/baixo/alto:</translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation>Ligado a:</translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation>Tempo ligado:</translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation>Volume:</translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation>Valor da sessão:</translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation>Valor total:</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation>Desligar</translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation>Byte</translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation>KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation>GB</translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation>A ligar a:</translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation>Ligado</translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation>Desligado</translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation>Log</translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation>A ligar a: %1</translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation>A executar o comando de pre-início...</translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation>A inicializar o modem...</translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation>Configuração</translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation>A configurar o volume da coluna...</translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation>A desligar o volume da coluna...</translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation>A ligar a %1</translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation>Linha ocupada, a desligar...</translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation>Linha ocupada, a esperar %1 segundos</translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation>Sem sinal</translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation>Sem ligação</translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation>A procurar %1</translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation>A gravar %1</translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation>A enviar %1</translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation>À espera de %1</translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation>À espera %1 segundos</translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation>Tempo de espera %1 segundos</translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation>Desligar</translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation>Atender</translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation>ID %1</translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation>Palavra Chave %1</translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation>A pedir %1</translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation>A pedir palavra chave %1</translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation>Início de ciclo %1</translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation>Erro: ciclo demasiado longo, ignorado.</translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation>Os ciclos são demasiado longos!</translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation>Fim de Ciclo %1</translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation>Fim de Ciclo sem início na linha %1</translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation>A iniciar o pppd...</translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation>Procurar variável: %1</translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation>Encontrado: %1</translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation>Em ciclo: %1</translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation>Expirou o tempo de espera do script!</translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation>A procurar: %1</translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation>À espera de: %1</translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation>A ligar à rede...</translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation>A executar o comando de inicialização...</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation>Feito</translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation>o comando pppd e os seus argumentos excedem o máximo de 1024 caractéres.</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível encontrar o comando PPP!&lt;br&gt;Certifique-se que o executável pppd está instalado e na directoria correcta.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível executar:&lt;br&gt; %1&lt;br&gt;Certifique-se que o pppd está executável e tem as permissões e o bit de SUID correctos.&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível encontrar:&lt;br&gt; %1&lt;br&gt;Certifique-se que a configuração do modem está correcta.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Selecionou o método PAP ou CHAP para autenticação e tem de fornecer o utilizador e palavra chave de acesso!&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível criar o ficheiro de autenticação&lt;br&gt;&quot;%1&quot; para o PAP ou CHAP&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation>Tem de especificar um número de telefone!</translation>
+    </message>
+</context>
+<context>
+    <name>QObject::ModemWidget</name>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="obsolete">Tempo de inactividade da ligação:</translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation>Inserir</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 91e0b89..8794708 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">Líquido</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sem transparência</translation>
+        <translation>Sem transparências</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracejado, cor do fundo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracejado, cor dos botões</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracejado transparente, cor do fundo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
+        <translation>Tracejado transparente, cor do botão</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar transparência</translation>
     </message>
     <message>
         <source>Menu color</source>
         <translation>Cor do menu</translation>
     </message>
     <message>
         <source>Text color</source>
         <translation>Cor do texto</translation>
     </message>
     <message>
         <source>Opacity</source>
         <translation>Opacidade</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto do menu com sombreado</translation>
+        <translation>Usar sombras no texto do menu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Botões planos na barra de ferramentas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
+        <translation>Contraste do tracejado</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation>Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Estilo </translation>
+        <translation>Estilo Líquido por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libmadplugin.ts b/i18n/pt/libmadplugin.ts
index 78b9fce..f5b3fe0 100644
--- a/i18n/pt/libmadplugin.ts
+++ b/i18n/pt/libmadplugin.ts
@@ -1,53 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LibMadPlugin</name>
     <message>
         <source>No Song Open</source>
         <translation>Nenhuma Música Carregada</translation>
     </message>
     <message>
         <source>Info: </source>
         <translation>Info:</translation>
     </message>
     <message>
         <source>Name: </source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Genre: </source>
         <translation>Género:</translation>
     </message>
     <message>
         <source>Bitrate: </source>
         <translation>Bitrate:</translation>
     </message>
     <message>
         <source>URL: </source>
         <translation>URL:</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Artist</source>
         <translation>Artista</translation>
     </message>
     <message>
         <source>Album</source>
-        <translation>Àlbum</translation>
+        <translation>Álbum</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Comentário</translation>
     </message>
     <message>
         <source>, Track: </source>
         <translation>, Pista:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libmail.ts b/i18n/pt/libmail.ts
index abc2559..0ae6eb3 100644
--- a/i18n/pt/libmail.ts
+++ b/i18n/pt/libmail.ts
@@ -1,100 +1,100 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MailFactory</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível juntar o ficheiro &apos;%1&apos;. Continuar na mesma ou abortar?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
 </context>
 <context>
     <name>SmtpHandler</name>
     <message>
         <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
+        <translation>A ligar ao servidor...</translation>
     </message>
     <message>
         <source>The server refused the connection.</source>
-        <translation type="unfinished"></translation>
+        <translation>O servidor recusou a ligação.</translation>
     </message>
     <message>
         <source>Host lookup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi encontrado o nome do servidor.</translation>
     </message>
     <message>
         <source>The read from the socket failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao ler os dados.</translation>
     </message>
     <message>
         <source>The sending failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao enviar os dados.</translation>
     </message>
     <message>
         <source>Host found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor encontrado.</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Ligado a %1</translation>
     </message>
     <message>
         <source>SMTP &gt; %3</source>
         <translation>SMTP &gt; %3</translation>
     </message>
     <message>
         <source>SMTP&gt; EHLO *</source>
         <translation>SMTP &gt; EHLO *</translation>
     </message>
     <message>
         <source>SMTP&gt; AUTH CRAM-MD5</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; AUTH CRAM-MD5</translation>
     </message>
     <message>
         <source>SMTP&gt; Authenticating</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; A autenticar</translation>
     </message>
     <message>
         <source>SMTP&gt; HELO *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; HELO *</translation>
     </message>
     <message>
         <source>SMTP&gt; MAIL FROM: *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; MAIL FROM: *</translation>
     </message>
     <message>
         <source>SMTP&gt; RCPT TO: *</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; RCPT TO: *</translation>
     </message>
     <message>
         <source>SMTP&gt; DATA</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; DATA</translation>
     </message>
     <message>
         <source>SMTP&gt; Sending data...</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; A enviar o email...</translation>
     </message>
     <message>
         <source>SMTP&gt; QUIT (Done)</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &gt; QUIT (Done)</translation>
     </message>
     <message>
         <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>O servidor retornou um erro:&lt;br&gt;%1</translation>
     </message>
     <message>
         <source>SMTP &lt; %3</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP &lt; %3</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmpeg3plugin.ts b/i18n/pt/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pl/libmpeg3plugin.ts
+++ b/i18n/pt/libmodplugin.ts
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index a6cdaf2..eb3b368 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -1,630 +1,675 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
         <translation>Botão do Calendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
         <translation>Botão de Contactos</translation>
     </message>
     <message>
         <source>Menu Button</source>
         <translation>Botão do Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
         <translation>Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Mostrar Rodar</translation>
     </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>Em Baixo+Cima</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>Em Baixo+Baixo</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>Em Baixo+Direita</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>Em Baixo+Esquerda</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>Em Cima+Cima</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>Em Cima+Baixo</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>Em Cima+Direita</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>Em Cima+Esquerda</translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mais</translation>
     </message>
     <message>
         <source>More...</source>
         <translation>Mais...</translation>
     </message>
 </context>
 <context>
     <name>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>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
-        <source>Documents</source>
-        <translation>Documentos</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation>Ficheiros</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation>Todos os Ficheiros</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>Todos</translation>
-    </message>
-    <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation>&amp;Gravar</translation>
-    </message>
-    <message>
-        <source>C&amp;ancel</source>
-        <translation>C&amp;ancelar</translation>
-    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation>Tipo de Mime</translation>
-    </message>
-    <message>
-        <source>Ser Permission</source>
-        <translation>Permissões</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Apagar</translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation>Tem a certeza que quer apagar
-</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sim</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Não</translation>
+        <translation>Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Médio</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeno</translation>
     </message>
 </context>
 <context>
     <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Todos:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data de Término</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>SemanaVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
         <translation>Sem Data de Término</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation>e</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>em</translation>
+    </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha Hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Summary:</source>
-        <translation>Sumário:</translation>
-    </message>
-    <message>
         <source>Description:</source>
-        <translation>Descrição:</translation>
+        <translation type="obsolete">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
+        <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Emprego:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
+        <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Pessoal:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Telemóvel Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Todos os E-Mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gestor:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Género:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Data Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Children: </source>
         <translation>Filhos:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
         <translation>Início:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
-        <translation>Todos os %1 %1</translation>
+        <translation type="obsolete">Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Ficheiros</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>Todos os Ficheiros</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>Muito Alto</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>Alto</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>Normal</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>Baixo</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>Muito Baixo</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Localização:</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>Este é um evento para o dia todo</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>Este é um evento para vários dias</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (emprego):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (pessoal):&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>Todos os %1 %2</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>nd</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>rd</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
     <message>
         <source>th</source>
-        <translation> </translation>
+        <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopieobex.ts b/i18n/pt/libopieobex.ts
index 7f7e552..f7c574c 100644
--- a/i18n/pt/libopieobex.ts
+++ b/i18n/pt/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;&lt;b&gt;Recebido:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Recebeu um ficheiro do tipo %1 (&lt;img src=&quot;%2&quot;&gt;). O que quer fazer com ele?</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;&lt;h1&gt;A Enviar:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviado</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation type="unfinished"></translation>
+        <translation>Infravermelhos desactivados!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar dispositivos com infravermelhos.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>O bluetooth não está disponível</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar por dispositivos com Bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation type="unfinished"></translation>
+        <translation>Marcado para envio.</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>Clique para irradiar</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviado</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falhou</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>Tentativa %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation type="unfinished">Procurar outra vez por </translation>
+        <translation>Procurar outra vez por dispositivos com infravermelhos.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar o envio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqhandwriting.ts b/i18n/pt/libqhandwriting.ts
index 06c3a1a..20ce33f 100644
--- a/i18n/pt/libqhandwriting.ts
+++ b/i18n/pt/libqhandwriting.ts
@@ -1,158 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajuda da Escrita Manual</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;ul&gt;&lt;li&gt;Quando começar a usar a escrita manual, escreva devagar, com precisão e firmemente.&lt;li&gt;Use as linhas de referência para desenhar os seus caractéres.&lt;li&gt;Quando desenhar um caractér de multiplos riscos, cada risco deverá ser feito antes que o anterior desapareça.&lt;li&gt;Pratique a escrita usando a opção de treino.&lt;li&gt;Se adicionar o seu próprio caractér, certifique-se que é suficientemente diferente dos que já existem.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>Dicas</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>Treino</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Matched: </source>
-        <translation type="unfinished"></translation>
+        <translation>Encontrado:</translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>Parecido com:</translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
         <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione um caractér de referência da lista. Pratique a escrita na àrea à direita.</translation>
     </message>
     <message>
         <source>No match</source>
-        <translation type="unfinished"></translation>
+        <translation>Não encontrado</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Handwriting</source>
         <translation>Handwriting</translation>
     </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>Novo...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInput</name>
     <message>
         <source>Shortcut</source>
         <translation>Atalho</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o caractér novo</translation>
     </message>
     <message>
         <source>Character:</source>
         <translation>Caracter:</translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tempo de espera entre os vários rabiscos do caractér:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>ms</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
+        <translation>Áreas a mostrar</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Áreas de letras grandes e pequenas</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
+        <translation>Letras Pequenas (mudar para Letras Grandes)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração da Escrita Manual</translation>
     </message>
     <message>
         <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
+        <translation>Perfil de Caractéres:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>Preferências</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 ms</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível gravar.
+Liberte algum espaço e
+tente novamente.
+
+Sair na mesma?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 31e1f1f..7511c5a 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -1,887 +1,956 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(multi.)</translation>
     </message>
     <message>
         <source>Business</source>
-        <translation type="unfinished"></translation>
+        <translation>Emprego</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Multi.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Categorias Aqui</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha as categorias para este documento.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza uma categoria nova aqui. Prima &lt;b&gt;Adicionar&lt;/b&gt; para adicionar à lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza uma nova categoria e prima &quot;Adicionar&quot; para a adicionar à lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prima para apagar a categoria selecionada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Active para marcar esta propriedade como disponível a todas as aplicações.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vazio</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Há outra aplicação a editar
 as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar Janeiro no ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar o mês seguinte</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar Dezembro no ano selecionado</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar o Selector de Ficheiros</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
+        <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para criar um documento novo.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;Clique e espere para as propriedades do documento.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Procurar</translation>
+        <translation>Procurar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto não encontrado.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
+        <translation>Chegou ao fim, a voltar ao início</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Find what:</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar o quê:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar Procura em:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
+        <translation>Dez 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensível a letra grande/pequena</translation>
     </message>
     <message>
         <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar para trás</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Documentos</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou a remoção do ficheiro.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Copia de</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou a cópia do ficheiro.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou ao mover o documento.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
-        <translation type="unfinished">Disco</translation>
+        <translation>Disco</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregamento rápido (consome mais memória)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
+        <translation>O sítio onde o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pre-carrega a aplicação para que esteja disponível instantaneamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fazer uma cópia do documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Irradiar este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar rotação personalizada</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação do Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Password</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
-        <translation type="unfinished">Sem Espaço</translation>
+        <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Houve um problema ao criar
+a informação de configuração 
+para este programa.
+
+Liberte algum espaço e tente
+novamente.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível criar os ficheiros
+de inicialização.
+
+Liberte algum espaço e tente
+novamente</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível gravar os dados
+do alarme.
+
+Liberte algum espaço e tente
+novamente.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All</source>
-        <translation type="unfinished">Todas</translation>
+        <translation>Todos</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">Vazio</translation>
+        <translation>Vazio</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Endereço (Emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Endereço (Pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
+        <translation>Endereços de Correio:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone (Pessoal):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fax (Pessoal):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telemóvel (Pessoal):</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>WebSite (Pessoal):</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>WebSite (Emprego):</translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation type="unfinished"></translation>
+        <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone (Emprego):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fax (Emprego):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telemóvel (Emprego):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Pager (Emprego):</translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation type="unfinished"></translation>
+        <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation type="unfinished"></translation>
+        <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Chefe:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation type="unfinished"></translation>
+        <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposa:</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Nascimento:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título (Pessoal)</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Ficheiro Como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título (Emprego)</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation type="unfinished"></translation>
+        <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation type="unfinished"></translation>
+        <translation>Empresa</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone (Emprego)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Fax (Emprego)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Telemóvel (Emprego)</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation type="unfinished"></translation>
+        <translation>EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation type="unfinished"></translation>
+        <translation>Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço (Emprego)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade (Emprego)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado (Emprego)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>Cód. Postal (Emprego)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation type="unfinished"></translation>
+        <translation>País (Emprego)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation type="unfinished"></translation>
+        <translation>Pager (Emprego)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
+        <translation>WebSite (Emprego)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation type="unfinished"></translation>
+        <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation type="unfinished"></translation>
+        <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Chefe</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished"></translation>
+        <translation>País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
+        <translation>WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation type="unfinished">Esposa</translation>
+        <translation>Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation type="unfinished"></translation>
+        <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation type="unfinished"></translation>
+        <translation>Filhos</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished"></translation>
+        <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished">Seg</translation>
+        <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished">Ter</translation>
+        <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished">Qua</translation>
+        <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished">Qui</translation>
+        <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished">Sex</translation>
+        <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished">Sáb</translation>
+        <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
+        <translation>Dom</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation>Clique para fechar esta janela, perdendo as alterações.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation>Clique para fechar esta janela.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation>Clique para fechar esta janela e aplicar as alterações.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation>Clique para tornar esta janela movível.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation>Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Qt&gt;Não existe manual de instruções para esta aplicação, no entanto existe ajuda contextual.&lt;p&gt;Para usar a ajuda contextual:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e espere no botão de ajuda.&lt;li&gt;quando a barra do título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique num controlo.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
+        <translation>O que é isto...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Tem a certeza que quer apagar
+%1?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
+        <source>Jan</source>
+        <translation>Jan</translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
+        <source>Feb</source>
+        <translation>Fev</translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
+        <source>Mar</source>
+        <translation>Mar</translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
+        <source>Apr</source>
+        <translation>Abr</translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation>Jun</translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation>Jul</translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation>Ago</translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation>Set</translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation>Out</translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation>Nov</translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation>Dez</translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>documento %1</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
+        <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
+        <translation>O executável dos Fusos Horários não foi encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
-        <translation type="unfinished"></translation>
+        <translation>Para poder mudar de fuso horário terá
+de instalar a aplicação.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível gravar os dados do alarme.
+Liberte algum espaço e tente novamente</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>ficheiros %1</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os ficheiros %1</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os ficheiros</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/librotateapplet.ts b/i18n/pt/librotateapplet.ts
index ea14b6a..28798e8 100644
--- a/i18n/pt/librotateapplet.ts
+++ b/i18n/pt/librotateapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>RotateApplet</name>
     <message>
         <source>Rotate shortcut</source>
         <translation>Atalho para rodar</translation>
     </message>
     <message>
         <source>Rotate</source>
-        <translation>Rodar</translation>
+        <translation>Rodar Ecrâ</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libsdmonapplet.ts b/i18n/pt/libsdmonapplet.ts
deleted file mode 100644
index f6cc139..0000000
--- a/i18n/pt/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation>Ejectar cartão</translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation>Monitor de SD</translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation>Falhou a ejeção do cartão!</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/libtheme.ts b/i18n/pt/libtheme.ts
index 15d1ee7..abd9964 100644
--- a/i18n/pt/libtheme.ts
+++ b/i18n/pt/libtheme.ts
@@ -1,36 +1,36 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Styles</name>
     <message>
         <source>Themed style</source>
         <translation>Estilo do tema</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
-        <translation>Engine de estilos compativel com KDE2</translation>
+        <translation>Motor de estilos compatível com KDE2</translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
         <translation>Estilo do Tema</translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
         <translation>Escolha o tema a usar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>[No theme]</source>
         <translation>[Sem tema]</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodayaddressbookplugin.ts b/i18n/pt/libtodayaddressbookplugin.ts
index 324ffe5..f064a0f 100644
--- a/i18n/pt/libtodayaddressbookplugin.ts
+++ b/i18n/pt/libtodayaddressbookplugin.ts
@@ -1,93 +1,94 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máximo de Linhas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
-        <translation type="unfinished"></translation>
+        <translation>Altera o número máximo de linhas a mostrar para cada aniversário ou nascimento</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar a linha ao fim de X caracteres:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar a linha ao fim de quantos caractéres</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
-        <translation type="unfinished"></translation>
+        <translation>Dias no futuro:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Quantos dias no futuro deverão ser procurados</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Para activar as alterações reinicie a aplicação!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar a cor da linha de cabeçalho:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
-        <translation type="unfinished"></translation>
+        <translation>Cores dos cabeçalhos!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar a Cor da Entrada:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta cor será usada para mostrar nascimentos e aniversários!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar a cor
+urgente se abaixo</translation>
     </message>
     <message>
         <source> days: </source>
-        <translation type="unfinished"></translation>
+        <translation>dias:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta cor urgente será usada se estiver perto de um evento!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta cor urgente será usada se estiver a menos de x dias de um nascimento ou aniversário!</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Extra de Contactos</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nascimentos nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum nascimento nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aniversários nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum aniversário nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível aceder à base de dados. Actualize a biblioteca do Opie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodaydatebookplugin.ts b/i18n/pt/libtodaydatebookplugin.ts
index 21ff052..487369c 100644
--- a/i18n/pt/libtodaydatebookplugin.ts
+++ b/i18n/pt/libtodaydatebookplugin.ts
@@ -1,83 +1,146 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
+        <translation>[com alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation>Dia todo</translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation type="unfinished">Motrar </translation>
+        <translation type="obsolete">Mostrar localização</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Active isto se quiser ver a localização de cada marcação</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>Mostrar notas</translation>
+        <translation type="obsolete">Mostrar notas</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Active isto se quiser ver a nota associada a cada marcação</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Mostrar apenas as
+próximas marcações</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Active isto se quiser ver apenas as próximas marcações</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Mostrar 
+quantas
+marcações?
+</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Qual o máximo de marcações a mostrar em ordem temporal</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Quantos dias mais</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Quantos dias mais deverão estar disponíveis</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">dia(s)</translation>
     </message>
     <message>
         <source>only today</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">apenas hoje</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation>DatebookPluginConfigBase</translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation>Mostrar localização</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation>Active isto se quiser ver a localização de cada marcação</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation>Mostrar notas</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation>Active isto se quiser ver a nota associada a cada marcação</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation>Mostrar próximas marcações</translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation>Active isto se quiser ver apenas as próximas marcações</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation>Mostrar tempo numa linha extra</translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation>Qual o máximo de marcações a mostrar em ordem temporal</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation>Quantas marcações serão mostradas?</translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation>apenas hoje</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation>Quantos dias mais deverão estar disponíveis</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation>Quantos dias mais</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Extra de Marcações</translation>
     </message>
     <message>
         <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mais marcações para hoje</translation>
     </message>
     <message>
         <source>No appointments today</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem marcações para hoje</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodayfortuneplugin.ts b/i18n/pt/libtodayfortuneplugin.ts
index bbe03aa..8ac8920 100644
--- a/i18n/pt/libtodayfortuneplugin.ts
+++ b/i18n/pt/libtodayfortuneplugin.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Fortune plugin</source>
-        <translation>Plugin Fortune</translation>
+        <translation>Resumo Frase do Dia</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodaymailplugin.ts b/i18n/pt/libtodaymailplugin.ts
index e7c185f..a2ac70c 100644
--- a/i18n/pt/libtodaymailplugin.ts
+++ b/i18n/pt/libtodaymailplugin.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Mail plugin</source>
-        <translation>Plugin de E-Mail</translation>
+        <translation>Resumo do E-Mail</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novo(s) email(s), &lt;b&gt;%2&lt;/b&gt; para sair</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodaystocktickerplugin.ts b/i18n/pt/libtodaystocktickerplugin.ts
index 0693d23..c2c6156 100644
--- a/i18n/pt/libtodaystocktickerplugin.ts
+++ b/i18n/pt/libtodaystocktickerplugin.ts
@@ -1,100 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>StockTicker plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Extra de Cotações da Bolsa</translation>
     </message>
 </context>
 <context>
     <name>StockTickerPluginWidget</name>
     <message>
         <source>Connection refused.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação recusada.</translation>
     </message>
     <message>
         <source>Could not find server.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível encontrar o servidor.</translation>
     </message>
     <message>
         <source>Socket read error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro na ligação.</translation>
     </message>
 </context>
 <context>
     <name>StocktickerPluginConfig</name>
     <message>
         <source>Enter stock symbols seperated
 by a space.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza os símbolos do mercado 
+separados por um espaço.</translation>
     </message>
     <message>
         <source>Toggles Time of current price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo da hora do preço actual</translation>
     </message>
     <message>
         <source>Toggles date field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo de data</translation>
     </message>
     <message>
         <source>Toggles Symbol field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do símbolo</translation>
     </message>
     <message>
         <source>Toggles Name of symbols owner field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do nome correspondente ao símbolo</translation>
     </message>
     <message>
         <source>Toggles current Price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do preço actual</translation>
     </message>
     <message>
         <source>Toggles last price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do último preço</translation>
     </message>
     <message>
         <source>Toggles opening price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do preço de abertura</translation>
     </message>
     <message>
         <source>Toggles minimum daily price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do preço mínimo do dia</translation>
     </message>
     <message>
         <source>Toggles maximum daily price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo do preço máximo do dia</translation>
     </message>
     <message>
         <source>Toggles daily variation of price field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo da variação do preço</translation>
     </message>
     <message>
         <source>Toggles volume of trading field</source>
-        <translation type="unfinished"></translation>
+        <translation>Activa/desactiva o campo da quantidade de acções movimentadas</translation>
     </message>
     <message>
         <source>How often stocks prices should be looked up. In minutes</source>
-        <translation type="unfinished"></translation>
+        <translation>Qual o intervalo de tempo para actualização dos dados, em minutos</translation>
     </message>
     <message>
         <source>Minutes between lookups.</source>
-        <translation type="unfinished"></translation>
+        <translation>Minutos entre actualizações.</translation>
     </message>
     <message>
         <source>Speed of scrolling action, in milliseconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidade de deslizamento, em milisegundos</translation>
     </message>
     <message>
         <source>Scroll Speed, in milliseconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidade de deslizamento, em milisegundos</translation>
     </message>
     <message>
         <source>Length of scrolling</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho do deslizamento</translation>
     </message>
     <message>
         <source>Scroll Length</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho do deslizamento</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodaytodolistplugin.ts b/i18n/pt/libtodaytodolistplugin.ts
index 0d5ffd5..d862816 100644
--- a/i18n/pt/libtodaytodolistplugin.ts
+++ b/i18n/pt/libtodaytodolistplugin.ts
@@ -1,40 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
-        <translation>Plugin Tarefas</translation>
+        <translation>Resumo das Tarefas</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existe &lt;b&gt; 1&lt;/b&gt; tarefa activa: &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas activas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Sem tarefas activas</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation>Número máximo de tarefas a mostrar</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation>tarefas mostradas</translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation>Cortar dados da tarefa ao fim de quantos caracteres</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation>Cortar linha aos X caracteres</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>tarefas a mostrar</translation>
+        <translation type="obsolete">tarefas a mostrar</translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>Número máximo de tarefas a mostrar</translation>
+        <translation type="obsolete">Número máximo de tarefas a mostrar</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>Cortar linha aos X caracteres</translation>
+        <translation type="obsolete">Cortar linha aos X caracteres</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>Cortar dados da tarefa ao fim de quantos caracteres</translation>
+        <translation type="obsolete">Cortar dados da tarefa ao fim de quantos caracteres</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libtodayweatherplugin.ts b/i18n/pt/libtodayweatherplugin.ts
index 742d427..fc0e3da 100644
--- a/i18n/pt/libtodayweatherplugin.ts
+++ b/i18n/pt/libtodayweatherplugin.ts
@@ -1,117 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Weather plugin</source>
-        <translation type="unfinished"></translation>
+        <translation>Extra Meteorológico</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o identificador de localização ICAO:</translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o código de quatro letras para a localização aqui. Consulte http://www.nws.noaa.gov/tg/siteloc.shtml para descobrir uma localização perto de si.</translation>
     </message>
     <message>
         <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
-        <translation type="unfinished"></translation>
+        <translation>Consulte http://www.nws.noaa.gov/tg/siteloc.shtml para descobrir uma localização perto de si.</translation>
     </message>
     <message>
         <source>Use metric units</source>
         <translation>Usar unidades métricas</translation>
     </message>
     <message>
         <source>Click here to select type of units displayed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para escolher o tipo de unidades a mostrar.</translation>
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequência de actualização (em minutos):</translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione o intervalo de actualização (em minutos) dos dados do tempo.</translation>
     </message>
 </context>
 <context>
     <name>WeatherPluginWidget</name>
     <message>
         <source>Retreiving current weather information.</source>
-        <translation type="unfinished"></translation>
+        <translation>A obter a informação meteorológica actual.</translation>
     </message>
     <message>
         <source>Temp: </source>
         <translation>Temp:</translation>
     </message>
     <message>
         <source>  Wind: </source>
         <translation>Vento:</translation>
     </message>
     <message>
         <source>
 Pres: </source>
         <translation>
 Pressão:</translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dados meteorológicos actuais não estão disponíveis.</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>E </source>
-        <translation type="unfinished"></translation>
+        <translation>E</translation>
     </message>
     <message>
         <source>NE </source>
-        <translation type="unfinished"></translation>
+        <translation>NE</translation>
     </message>
     <message>
         <source>N </source>
-        <translation type="unfinished"></translation>
+        <translation>N</translation>
     </message>
     <message>
         <source>NW </source>
-        <translation type="unfinished"></translation>
+        <translation>NO</translation>
     </message>
     <message>
         <source>W </source>
-        <translation type="unfinished"></translation>
+        <translation>O</translation>
     </message>
     <message>
         <source>SW </source>
-        <translation type="unfinished"></translation>
+        <translation>SO</translation>
     </message>
     <message>
         <source>S </source>
-        <translation type="unfinished"></translation>
+        <translation>S</translation>
     </message>
     <message>
         <source>SE </source>
-        <translation type="unfinished"></translation>
+        <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
-        <translation type="unfinished"></translation>
+        <translation>K/H</translation>
     </message>
     <message>
         <source> MPH</source>
-        <translation type="unfinished"></translation>
+        <translation>M/H</translation>
     </message>
     <message>
         <source> hPa</source>
-        <translation type="unfinished"></translation>
+        <translation>hPa</translation>
     </message>
     <message>
         <source> Hg</source>
-        <translation type="unfinished"></translation>
+        <translation>Hg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/librestartapplet.ts b/i18n/pt/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pl/librestartapplet.ts
+++ b/i18n/pt/libtremorplugin.ts
diff --git a/i18n/pt/libwlan.ts b/i18n/pt/libwlan.ts
new file mode 100644
index 0000000..1f43b84
--- a/dev/null
+++ b/i18n/pt/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configuração de Rede sem Fios</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Especificar o Ponto de &amp;Acesso</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Especificar o &amp;Canal</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>qualquer</translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation>Infraestrutura</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Auto</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>&quot;Managed&quot;</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>&quot;Ad-Hoc&quot;</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>&amp;Activar Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Configuração da &amp;Chave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Chave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Chave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Chave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Chave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Pacotes não encriptados</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Aceitar</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rejeitar</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Informação da Interface</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Estação</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>PA</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Velocidade</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualidade</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruído</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Sinal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libwlanplugin.ts b/i18n/pt/libwlanplugin.ts
new file mode 100644
index 0000000..dede6aa
--- a/dev/null
+++ b/i18n/pt/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>Configuração da Rede sem Fios</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>MAC</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>Especifique o Ponto de &amp;Acesso</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>Espeficique o &amp;Canal</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>Automático</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>Managed</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>Ad-Hoc</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>qualquer</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>Activar &amp;Encriptação</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>Configurar &amp;Chave</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>Chave &amp;1</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>Chave &amp;2</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>Chave &amp;3</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>Chave &amp;4</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>Pacotes não encriptados</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>&amp;Aceitar</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>&amp;Rejeitar</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>Informação da Interface</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>802.11b</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>Canal</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>Modo</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>ESSID</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>Estação</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>PA</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>Velocidade</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>Qualidade</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>Ruído</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>Sinal</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index ce021f5..03b6e12 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -1,151 +1,151 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Níveis</translation>
     </message>
 </context>
 <context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>A luz do ecrâ será ajustada automaticamente mediante a luz ambiente. O parametro do brilho afectará o brilho médio.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Reduzir brilho ao fim de</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender ao fim de</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Desligar luz ao fim de</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações de Luz e Energia</translation>
     </message>
     <message>
         <source>on Battery</source>
-        <translation type="unfinished"></translation>
+        <translation>em Bateria</translation>
     </message>
     <message>
         <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações Gerais</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>seg</translation>
     </message>
     <message>
         <source>never</source>
-        <translation type="unfinished"></translation>
+        <translation>nunca</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
+        <translation>Apenas desactivar o ecrâ (não desligar)</translation>
     </message>
     <message>
         <source>Backlight</source>
-        <translation type="unfinished"></translation>
+        <translation>Luz</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
+        <translation>atribuir um valor fixo para a luz</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Máximo</translation>
     </message>
     <message>
         <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar o sensor de Luz</translation>
     </message>
     <message>
         <source>Calibrate</source>
-        <translation type="unfinished"></translation>
+        <translation>Calibrar</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações avançadas para o sensor de luz</translation>
     </message>
     <message>
         <source>on AC</source>
-        <translation type="unfinished"></translation>
+        <translation>ligado à corrente</translation>
     </message>
     <message>
         <source>Warnings</source>
-        <translation type="unfinished"></translation>
+        <translation>Avisos</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervalo de aviso de bateria baixa</translation>
     </message>
     <message>
         <source> %</source>
-        <translation type="unfinished"></translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
+        <translation>Qual o nível de energia da bateria para que seja avisado</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
+        <translation>qual o intervalo para verificar a carga da bateria. Este valor determina também o intervalo dos avisos</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
+        <translation>Qual o nível crítico de energia da bateria para que seja avisado</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
+        <translation>bateria baixa aos</translation>
     </message>
     <message>
         <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
+        <translation>bateria crítica aos</translation>
     </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
+        <translation>Calibração do Sensor</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Máximo</translation>
     </message>
     <message>
         <source>Off</source>
-        <translation type="unfinished">Desligar</translation>
+        <translation>Desligado</translation>
     </message>
     <message>
         <source>Dark</source>
-        <translation type="unfinished"></translation>
+        <translation>Escuro</translation>
     </message>
     <message>
         <source>Light</source>
-        <translation type="unfinished"></translation>
+        <translation>Claro</translation>
     </message>
     <message>
         <source>Steps</source>
-        <translation type="unfinished"></translation>
+        <translation>Níveis</translation>
     </message>
     <message>
         <source>Check interval</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervalo</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>seg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mail.ts b/i18n/pt/mail.ts
index 3f4d385..a077733 100644
--- a/i18n/pt/mail.ts
+++ b/i18n/pt/mail.ts
@@ -1,903 +1,906 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountEditor</name>
     <message>
         <source>Warning</source>
         <translation>Atenção</translation>
     </message>
     <message>
         <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A sua assinatura é maior que quatro linhas. Isto é considerado uma falta de respeito pela maioria das pessoas. Deverá encolher a sua assinatura.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Mudar</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
 </context>
 <context>
     <name>AccountEditorBase</name>
     <message>
         <source>Account Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Contas</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Servidor</translation>
     </message>
     <message>
         <source>&lt;b&gt;Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Porta:</translation>
     </message>
     <message>
         <source>&lt;b&gt;IMAP:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;IMAP:</translation>
     </message>
     <message>
         <source>[--]</source>
-        <translation type="unfinished"></translation>
+        <translation>[--]</translation>
     </message>
     <message>
         <source>&lt;b&gt;SMTP:</source>
         <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
         <translation>&lt;b&gt;Utilizador:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
         <translation>&lt;b&gt;Password:</translation>
     </message>
     <message>
         <source>Identity</source>
         <translation>Identidade</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
         <translation>&lt;b&gt;Nome:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
         <translation>&lt;b&gt;E-Mail:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
         <translation>&lt;b&gt;Organização:</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
         <translation>Bcc</translation>
     </message>
     <message>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder-A</translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
         <translation>&lt;b&gt;Assinatura:</translation>
     </message>
     <message>
         <source>SSL</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL</translation>
     </message>
     <message>
         <source>IMAP</source>
         <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar SSL</translation>
     </message>
     <message>
         <source>993</source>
         <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
         <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não existem entradas nos contactos.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de escolher pelo menos uma entrada dos contactos.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha de Contactos</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha uma entrada primeiro.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Descrição</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=&quot;center&quot;&gt;Descrição</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de especificar um destinatário.&lt;br&gt;(ex: foo@bar.org)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Houve um problema ao enviar alguns dos mails a enviar.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
-        <translation type="unfinished"></translation>
+        <translation>Sucesso</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;O correio foi colocado na caixa &quot;a enviar&quot;.&lt;/p&gt;Essa caixa contém</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>emails.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;font color=&quot;#ff0000&quot;&gt;Erro ao enviar.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;%1&lt;/p</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Email enviado com sucesso.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Os mails na caixa &quot;a enviar&quot;</translation>
     </message>
     <message>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation>de</translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Compôr Mensagem</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished">Correio</translation>
+        <translation>EMail</translation>
     </message>
     <message>
         <source>Send the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar o EMail</translation>
     </message>
     <message>
         <source>Queue the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Colocar na caixa &quot;a enviar&quot;</translation>
     </message>
     <message>
         <source>Attach a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexar um ficheiro</translation>
     </message>
     <message>
         <source>Addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Contactos</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Cc</source>
-        <translation type="unfinished">Cc</translation>
+        <translation>Cc</translation>
     </message>
     <message>
         <source>Bcc</source>
-        <translation type="unfinished">Bcc</translation>
+        <translation>Bcc</translation>
     </message>
     <message>
         <source>Subj.</source>
         <translation>Assunto.</translation>
     </message>
     <message>
         <source>Prio.</source>
         <translation>Prio.</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixa</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar um Anexo</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover um Anexo</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar o Nome</translation>
     </message>
     <message>
         <source>Change Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar a Descrição</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de escolher uma conta primeiro.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
-        <translation type="unfinished"></translation>
+        <translation>Questão</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem a certeza que quer apagar a conta seleccionada?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>Contas</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>[Hidden]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Escondido]</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Geral</translation>
     </message>
     <message>
         <source>Mail notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Notificação de EMail</translation>
     </message>
     <message>
         <source>Blink LED</source>
         <translation>Piscar luz</translation>
     </message>
     <message>
         <source>Play sound</source>
         <translation>Tocar som</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Verificar&amp;nbsp;todos</translation>
     </message>
     <message>
         <source> min</source>
-        <translation type="unfinished"></translation>
+        <translation>min</translation>
     </message>
     <message>
         <source>Disable mail notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar notificação de email</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Correio versão %1&lt;/b&gt;&lt;hr&gt;
+Patrocinado e programado por LISAsystems&lt;br&gt;
+Visite http://www.lisa.de/ para mais informações.
+</translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Mover</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Create folder</source>
         <translation>Criar pasta</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-ler lista de pastas</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de escolher um item primeiro.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
-        <translation type="unfinished"></translation>
+        <translation>Questão</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem a certeza que quer apagar &lt;pre&gt;%1&lt;/pre&gt;?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Foldername</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome da Pasta</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Introduza o nome para a nova pasta.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar o servidor...</translation>
     </message>
     <message>
         <source>Host found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor encontrado.</translation>
     </message>
     <message>
         <source>Connected to host.</source>
-        <translation type="unfinished"></translation>
+        <translation>A ligar ao servidor.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A ligação IMAP foi recusada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;O servidor não foi encontrado.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Houve um erro ao ler dados da ligação.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Falhou a autenticação. Verifique a conta e/ou a password.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Ocorreu um erro desconhecido.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Disconnected.</source>
         <translation>Desligado.</translation>
     </message>
     <message>
         <source>Login successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticado!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Falhou a autenticação.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Renaming successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Sucesso ao mudar o nome!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Erro ao mudar o nome. (erro: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Deletion successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Remoção bem sucedida!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Falhou a remoção. (erro: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Folder created. Rescanning...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasta criada. A actualizar...</translation>
     </message>
     <message>
         <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Erro ao criar a pasta. (erro: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível abrir o ficheiro de cache para escrever!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Got folder list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de pastas lida.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível ler a lista de pastas. (erro: %1)&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>MailTable</name>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Assunto</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Seen</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Unseen</source>
         <translation>Não Vista</translation>
     </message>
     <message>
         <source>Marked</source>
         <translation>Marcada</translation>
     </message>
     <message>
         <source>Unmarked</source>
         <translation>Não Marcada</translation>
     </message>
     <message>
         <source>Mark as...</source>
         <translation>Marcar como...</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Apagar Correio</translation>
     </message>
     <message>
         <source>Mailbox contained no mails.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem emails nesta pasta.</translation>
     </message>
     <message>
         <source>Getting mail headers...</source>
-        <translation type="unfinished"></translation>
+        <translation>A obter os cabeçalhos do correio...</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Ocorreu um erro ao seleccionar a caixa de correio. (erro: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Parado</translation>
     </message>
     <message>
         <source>Got all mail headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabeçalhos do correio obtidos.</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;font color=&quot;#ff0000&quot;&gt;Não foi possível obter o correio.</translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase</name>
     <message>
         <source>E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>EMail</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correio</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Servidores</translation>
     </message>
     <message>
         <source>Compose new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Compôr novo email</translation>
     </message>
     <message>
         <source>Send queued mails</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar os mails na caixa &quot;a enviar&quot;</translation>
     </message>
     <message>
         <source>Show/hide folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar/esconder pastas</translation>
     </message>
     <message>
         <source>Search mails</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar correio</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
 </context>
 <context>
     <name>OpenDiagBase</name>
     <message>
         <source>Open file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir ficheiro...</translation>
     </message>
     <message>
         <source> Stop </source>
         <translation>Parar</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt;KB de &lt;b&gt;%2&lt;/b&gt;KB em &lt;b&gt;%3&lt;/b&gt;KB/s</translation>
     </message>
     <message>
         <source>[Icon]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Icone]</translation>
     </message>
     <message>
         <source>&lt;i&gt;application/v-card</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;application/v-card</translation>
     </message>
     <message>
         <source>Open using an application</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir com a aplicação</translation>
     </message>
     <message>
         <source>Save to disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar para o disco</translation>
     </message>
     <message>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar</translation>
     </message>
     <message>
         <source>Save to</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar em</translation>
     </message>
     <message>
         <source>RAM</source>
-        <translation type="unfinished"></translation>
+        <translation>RAM</translation>
     </message>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>SD</source>
         <translation>SD</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>(no name)</source>
         <translation>(sem nome)</translation>
     </message>
     <message>
         <source>&lt;Foldertree not known.&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Árvore de pastas não conhecida.&gt;</translation>
     </message>
     <message>
         <source>Inbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa de Entrada</translation>
     </message>
     <message>
         <source>(no from)</source>
         <translation>(sem de)</translation>
     </message>
     <message>
         <source>(no subject)</source>
         <translation>(sem assunto)</translation>
     </message>
     <message>
         <source>(no date)</source>
         <translation>(sem data)</translation>
     </message>
 </context>
 <context>
     <name>RenameBase</name>
     <message>
         <source>Renaming</source>
-        <translation type="unfinished"></translation>
+        <translation>A mudar o nome</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Renaming</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=&quot;center&quot;&gt;A mudar o nome</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;to</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=&quot;center&quot;&gt;para</translation>
     </message>
 </context>
 <context>
     <name>SearchDiag</name>
     <message>
         <source>Body</source>
         <translation>Corpo</translation>
     </message>
     <message>
         <source>Header Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Campo do Cabeçalho</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>Assunto</translation>
     </message>
     <message>
         <source>From</source>
         <translation>De</translation>
     </message>
     <message>
         <source>To</source>
         <translation>Para</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Introduza o texto para procura.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Escolha uma pasta.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Escolha um cabeçalho para procurar.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível seleccionar a pasta. (erro: %1)</translation>
     </message>
     <message>
         <source>Results</source>
-        <translation type="unfinished"></translation>
+        <translation>Resultados</translation>
     </message>
     <message>
         <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nenhum correio encontrado para a pesquisa.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Search failed. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A pesquisa falhou. (erro: %1)</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível obter os cabeçalhos. (erro: %1)</translation>
     </message>
 </context>
 <context>
     <name>SearchDiagBase</name>
     <message>
         <source>Mail Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Procura de Correio</translation>
     </message>
     <message>
         <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Procurar&amp;nbsp;em:</translation>
     </message>
     <message>
         <source>&lt;b&gt;For:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Por:</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;De:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Para:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Data:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</translation>
     </message>
     <message>
         <source>(no subject)</source>
-        <translation type="unfinished">(sem assunto)</translation>
+        <translation>(sem assunto)</translation>
     </message>
     <message>
         <source>(no from)</source>
-        <translation type="unfinished">(sem de)</translation>
+        <translation>(sem originador)</translation>
     </message>
     <message>
         <source>(no recipient)</source>
-        <translation type="unfinished"></translation>
+        <translation>(sem destinatário)</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>(no date)</source>
-        <translation type="unfinished">(sem data)</translation>
+        <translation>(sem data)</translation>
     </message>
     <message>
         <source>Getting mail body from server. Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>A obter o corpo do correio...</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Erro</translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de obter o corpo do correio antes de tentar responder.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tem de obter o corpo do correio antes de tentar reencaminhar.</translation>
     </message>
     <message>
         <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não foi possível obter o correio do servidor. Tente novamente mais tarde.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio de %1</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Correio</translation>
     </message>
     <message>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation>Re-encaminhar</translation>
+        <translation>Reencaminhar</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexos</translation>
     </message>
     <message>
         <source>Delete Mail</source>
         <translation>Apagar Correio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mailit.ts b/i18n/pt/mailit.ts
index d61ee1d..5920ce5 100644
--- a/i18n/pt/mailit.ts
+++ b/i18n/pt/mailit.ts
@@ -1,531 +1,633 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexado</translation>
     </message>
     <message>
         <source>File type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de Ficheiro</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>attach...</source>
-        <translation type="unfinished"></translation>
+        <translation>anexar...</translation>
+    </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>A adicionar anexos</translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Conta</translation>
     </message>
     <message>
         <source>Create new Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar conta Nova</translation>
     </message>
     <message>
         <source>Account name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome da Conta</translation>
     </message>
     <message>
         <source>Your name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Email</source>
-        <translation type="unfinished"></translation>
+        <translation>EMail</translation>
     </message>
     <message>
         <source>POP username</source>
-        <translation type="unfinished"></translation>
+        <translation>Conta POP</translation>
     </message>
     <message>
         <source>POP password</source>
-        <translation type="unfinished"></translation>
+        <translation>Password POP</translation>
     </message>
     <message>
         <source>POP server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor POP</translation>
     </message>
     <message>
         <source>SMTP server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor SMTP</translation>
     </message>
     <message>
         <source>Synchronize</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho (KB)</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
-        <translation type="unfinished"></translation>
+        <translation>Inactivo</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>Contas</translation>
     </message>
     <message>
         <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter Correio de</translation>
     </message>
     <message>
         <source>Edit account</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Conta</translation>
     </message>
     <message>
         <source>Delete account</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar Conta</translation>
     </message>
     <message>
         <source>Send mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar EMail</translation>
     </message>
     <message>
         <source>Compose</source>
-        <translation type="unfinished"></translation>
+        <translation>Compôr</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar Transferência</translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>De</translation>
     </message>
     <message>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Assunto</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Inbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa Entrada</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>Para</translation>
     </message>
     <message>
         <source>Outbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Caixa Saída</translation>
     </message>
     <message>
         <source>No account selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma conta selecionada</translation>
     </message>
     <message>
         <source>You must create an account</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem de criar uma conta</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de operações principal</translation>
     </message>
     <message>
         <source>getMail</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter Correio</translation>
     </message>
     <message>
         <source>select account</source>
-        <translation type="unfinished"></translation>
+        <translation>selecione a conta</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para obter o correio de todas as contas disponíveis.
+Clique e espere para seleccionar uma conta.</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>No account associated</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem conta associada</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Não existe nenhuma conta activa
+associada a este mail e portanto
+não poderá ser obtido</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Resposta desconhecida do servidor&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;servidor não encontrado&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;conexão recusada&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;erro na transmissão dos dados&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Autenticação falhou
+Verifique conta e palavra chave&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>Erro ao receber</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>Ok
+</translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível localizar todos
+os ficheiros no correio com o assunto:</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
+        <translation>
+Falhou o envio do correio</translation>
     </message>
     <message>
         <source>Attachment error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro no anexo</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ok
+</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Escrever Mail</translation>
     </message>
     <message>
         <source>Central view area</source>
-        <translation type="unfinished"></translation>
+        <translation>Área de vista central</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio ainda não obtido</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>O correio que clicou ainda
+não foi obtido. Quer obtê-lo
+agora ?</translation>
+    </message>
+    <message>
+        <source>Mailit</source>
+        <translation>Mailit</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>Lêr Mail</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação efectuada</translation>
     </message>
     <message>
         <source>Error Occured</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um Erro</translation>
     </message>
     <message>
         <source>Retrieving </source>
-        <translation type="unfinished"></translation>
+        <translation>A obter</translation>
     </message>
     <message>
         <source>Completing message </source>
-        <translation type="unfinished"></translation>
+        <translation>A completar a mensagem</translation>
     </message>
     <message>
         <source>No new Messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mensagens Novas</translation>
     </message>
     <message>
         <source> new messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens novas</translation>
     </message>
     <message>
         <source>No new messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem mensagens novas</translation>
+    </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>Procura no DNS</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o assunto do correio aqui</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza os destinatários do correio aqui</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza outros destinatário para o correio aqui</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o texto do correio aqui</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
+        <translation>Coloque este correio na caixa &quot;a enviar&quot; clicando aqui</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Este é um resumo de todos os anexos do correio</translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a vista da caixa de entrada.
+Ela mostra os mails obtidos que podem ser
+lidos se clicar duas vezes na entrada.
+A existencia de um icon azul revela a 
+existência de anexos.</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a vista da caixa de saída.
+Ela mostra os mails para saír que podem ser
+revistos se clicar duas vezes na entrada.
+</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha os destinatários desta lista</translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>Este botão dá acesso aos contactos disponíveis nos contactos do Opie</translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ver</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Anterior</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Próxima</translation>
     </message>
     <message>
         <source>Attatchments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexos</translation>
     </message>
     <message>
         <source>Text Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato do Texto</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Reenviar</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para reencaminhar o correio selecionado</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ler o correio anterior da lista</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Ler o correio seguinte da lista</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar anexos ao correio</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
+        <translation>Existem duas vistas para o correio:
+&lt;li&gt;&lt;b&gt;HTML&lt;/b&gt; mostra o mail como HTML&lt;/li&gt;&lt;li&gt;&lt;b&gt;Texto&lt;/b&gt; mostra o mail como texto&lt;/li&gt;Clique aqui para alternar entre os dois modos</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para remover os correios selecionados</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para obter o correio selecionado</translation>
     </message>
     <message>
         <source>reply</source>
-        <translation type="unfinished"></translation>
+        <translation>responder</translation>
     </message>
     <message>
         <source>reply to mail</source>
-        <translation type="unfinished"></translation>
+        <translation>responder ao correio</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para responder ao correio selecionado
+Clique e espera para mais opções.</translation>
     </message>
     <message>
         <source>Reply all</source>
-        <translation type="unfinished"></translation>
+        <translation>Responder a Todos</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para responder a todos os destinatários do correio</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
+        <translation>À procura do nome do servidor</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado</translation>
     </message>
     <message>
         <source>Sending: </source>
-        <translation type="unfinished"></translation>
+        <translation>A Enviar:</translation>
     </message>
     <message>
         <source>Sent </source>
-        <translation type="unfinished"></translation>
+        <translation>Enviado</translation>
     </message>
     <message>
         <source> messages</source>
-        <translation type="unfinished"></translation>
+        <translation>mensagens</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
-        <translation type="unfinished"></translation>
+        <translation>Instalar</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para copiar os anexos para a pasta dos documentos</translation>
+    </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>Navegar nos anexos</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>Instalado</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E&amp;Mail</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Adicionar</translation>
     </message>
     <message>
         <source>Enque mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio a enviar</translation>
     </message>
     <message>
         <source>New mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo EMail</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation>Para:</translation>
     </message>
     <message>
         <source>CC:</source>
-        <translation type="unfinished"></translation>
+        <translation>CC:</translation>
     </message>
     <message>
         <source>Subject:</source>
-        <translation type="unfinished"></translation>
+        <translation>Assunto:</translation>
     </message>
     <message>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation>...</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anexo</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para anexar ficheiros ao seu correio</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
+        <translation>Este botão coloca o seu correio na caixa de saída</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para criar um novo correio</translation>
     </message>
     <message>
         <source>No recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem destinatários</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar o correio a quem?</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ok
+</translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separador de destinatários incorrecto</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Os destinatários deverão ser separados
+pelo caractér &quot;;&quot; e deverão ser endereços
+de correio válidos</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
+        <translation>Separador de CC incorrecto</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>Os destinatários em CC deverão ser separados
+pelo caractér &quot;;&quot; e deverão ser endereços
+de correio válidos</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation type="unfinished"></translation>
+        <translation>Re:</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
+        <translation>======mensagem reenviada de</translation>
     </message>
     <message>
         <source> starts======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>início=====
+
+</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation type="unfinished"></translation>
+        <translation>FWD:</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>======fim de mensagem reenviada======
+
+</translation>
     </message>
     <message>
         <source> wrote on </source>
-        <translation type="unfinished"></translation>
+        <translation>escrita em</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>EMail</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mediummount.ts b/i18n/pt/mediummount.ts
index 63cb732..4017849 100644
--- a/i18n/pt/mediummount.ts
+++ b/i18n/pt/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
+        <source>Medium Mount Settings</source>
+        <translation>Configurações de Cartões</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Global</source>
+        <translation>Globais</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>Se introduzir um cartão neste dispositivo, o Opie irá tentar procurar documentos nele. Se o cartão for grande, esta operação poderá demorar bastante tempo. Pode escolher se o Opie deverá procurar os documentos numa base global ou cartão a cartão. Poderá tambem reconfigurar cada cartão individualmente.</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Activar procura de documentos</translation>
     </message>
     <message>
         <source>Use global settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar configurações globais</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Quais os tipos de documentos</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagem</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation>Configurar este cartão. As alterações serão aplicadas quando a aplicação for fechada. Para actualizar a pasta de documentos deverá retirar e reintroduzir este cartão.</translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Quais os tipos de documentos</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Áudio</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Imagem</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Vídeo</translation>
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Limitar a procura a:</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar sempre neste cartão</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/netsetup.ts b/i18n/pt/netsetup.ts
deleted file mode 100644
index 4c94365..0000000
--- a/i18n/pt/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Adicionar Ligação</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>&lt;p&gt;Ligações disponíveis.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Adicionar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Cancelar</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Apenas uma ligação %1. Remova a actual ou altere as propriedades</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Rede</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Rede</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Actual</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;Estado das ligações.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Ligações</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Adicionar...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;p&gt;Ligações disponíveis.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Remover</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Propriedades</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/networksettings.ts b/i18n/pt/networksettings.ts
index 0ec392b..e8dc94c 100644
--- a/i18n/pt/networksettings.ts
+++ b/i18n/pt/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>Adicionar Ligação à Rede</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Adicionar</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Serviços</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Configuração da Rede</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Ligações</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>in</source>
         <translation>em</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Adicionar</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>&amp;Informação</translation>
+        <translation type="obsolete">&amp;Informação</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Configuração</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Perfis</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Alterar Actuais</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>Perfil Actual</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>Novo Perfil</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation>Uma lista de configurações de rede para escolher</translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation>Adicionar uma nova interface à lista.</translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation>&amp;Iniciar/Parar</translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation>Inicia e Para a interface actual, mostra informação adicional acerca da interface.</translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation>Configurar a interface actual</translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation>Apaga da lista a interface actual.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation>Desligada</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation>Não foi possível remover.</translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation>Desculpe</translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation>Primeiro escolha a interface.</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/odict.ts b/i18n/pt/odict.ts
index 5b587d8..50da67c 100644
--- a/i18n/pt/odict.ts
+++ b/i18n/pt/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Método de Procura</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
+        <source>New</source>
+        <translation>Novo</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <source>Change</source>
+        <translation>Mudar</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
-        <translation type="unfinished"></translation>
+        <translation>Dicionário Opie</translation>
     </message>
     <message>
         <source>Query:</source>
-        <translation type="unfinished"></translation>
+        <translation>Procura:</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
+        <translation>Métodos de Procura</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sensível a letra grande/pequena</translation>
     </message>
     <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <source>3 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>Parameter</source>
+        <translation>Parâmetros</translation>
     </message>
     <message>
-        <source>4 Errors</source>
-        <translation type="unfinished"></translation>
+        <source>No dictionary defined</source>
+        <translation>Nenhum dicionário definido</translation>
     </message>
     <message>
-        <source>Until Hit</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Define one</source>
+        <translation>&amp;Definir um</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="unfinished"></translation>
+        <source>&amp;Cancel</source>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Configuration</source>
+        <translation>Configuração</translation>
     </message>
     <message>
-        <source>Parameter</source>
-        <translation type="unfinished"></translation>
+        <source>Opie-Dictionary</source>
+        <translation>Dicionário Opie</translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Dictionary file</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro de Dicionário</translation>
     </message>
     <message>
         <source>Browse</source>
-        <translation type="unfinished"></translation>
+        <translation>Navegar</translation>
     </message>
     <message>
         <source>Language 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Idioma 1</translation>
     </message>
     <message>
         <source>Decollator</source>
-        <translation type="unfinished"></translation>
+        <translation>Decolador</translation>
     </message>
     <message>
         <source>Language 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Idioma 2</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo método de procura</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar método de procura</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/oipkg.ts b/i18n/pt/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/pt/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/opie-console.ts b/i18n/pt/opie-console.ts
index 1d2bf0c..2e497ad 100644
--- a/i18n/pt/opie-console.ts
+++ b/i18n/pt/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração de parametros de ligação</translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation>Configurações 1</translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation>Configurações 2</translation>
     </message>
     <message>
         <source>Init string </source>
-        <translation type="unfinished"></translation>
+        <translation>String de Inicialização</translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar String</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefixo de ligação #1</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufixo de ligação #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefixo de ligação #2</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufixo de ligação #2</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefixo de ligação #3</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufixo de ligação #3</translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation type="unfinished"></translation>
+        <translation>String de ligação</translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
+        <translation>String para desligar</translation>
     </message>
     <message>
         <source>Dial time </source>
-        <translation type="unfinished"></translation>
+        <translation>Tempo de ligação</translation>
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
+        <translation>Tempo de espera entre tentativas</translation>
     </message>
     <message>
         <source>Number of tries </source>
-        <translation type="unfinished"></translation>
+        <translation>Número de tentativas</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
+        <translation>Tempo para desligar DTR (0=não)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
+        <translation>Deteção automática de velocidade</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
+        <translation>O Modem tem DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar multi-ligações</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
-        <translation type="unfinished"></translation>
+        <translation>Ou endereço MAC do destino</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>Editar perfil de Ligação</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>Nova Ligação</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Profile Name</source>
-        <translation type="unfinished">Nome do </translation>
+        <translation>Nome do Perfil</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Adicionar</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Remover</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Comando a executar</translation>
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Variáveis de Ambiente</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Value</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>Name :</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Value :</source>
         <translation>Valor:</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o número</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o número a marcar. No fim, escolha Ok</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor Básico</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emulação de Terminal:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Camada IO:</translation>
     </message>
     <message>
         <source>Look</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation>Fundo:</translation>
     </message>
     <message>
         <source>Black</source>
         <translation>Preto</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Branco</translation>
     </message>
     <message>
         <source>Gray</source>
         <translation>Cinzento</translation>
     </message>
     <message>
         <source>Background:</source>
         <translation>Fundo:</translation>
     </message>
     <message>
         <source>Font:</source>
         <translation>Fonte:</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished">Micro</translation>
+        <translation>Micro</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Média</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível iniciar</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível duplicar processo (fork)</translation>
     </message>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível iniciar</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation>Dimensões</translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation>Editar Tecla</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation>Velocidade</translation>
     </message>
     <message>
         <source>Flow control</source>
-        <translation type="unfinished"></translation>
+        <translation>Controlo (flow)</translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>Paridade</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>Par</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>Ímpar</translation>
     </message>
     <message>
         <source>Data Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Bits de Dados</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Bits de Paragem</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
         <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation>115200 baud</translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation>57600 baud</translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation>38400 baud</translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation>19200 baud</translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation>9600 baud</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Não está ligado</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Velocidade inválida</translation>
     </message>
     <message>
         <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
+        <translation>O dispositivo já está em uso</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>Configuração de Perfis</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>Nova Ligação</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>Gravar Ligação</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Ligar</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
+        <translation>Execução Rápida</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
+        <translation>O botão da concha lança o perfil por omissão. Se não existir nenhum, serão usados os valores por omissão</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>Transferir ficheiro...</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Quebrar linha</translation>
     </message>
     <message>
         <source>Full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>Gravar histórico</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>Fechar Janela</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Executar Script</translation>
     </message>
     <message>
         <source>Record Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Script</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>Abrir Teclado...</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>Novo a partir do Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation type="unfinished"></translation>
+        <translation>Scripts</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Script</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Não existe ligação.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
         <translation>Histórico</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Novo Perfil</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation>Gravar Perfil</translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>O modem está ligado a:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza o número de telefone aqui:</translation>
     </message>
     <message>
         <source>AT commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Comandos AT</translation>
     </message>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza número</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Este extra não suporta nenhuma configuração</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligar automaticamente ao iniciar</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola Local</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>Novo Perfil</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Consola Opie </translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>Falhou</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>A ligação falhou para esta sessão.</translation>
     </message>
     <message>
         <source>Session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou a sessão</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Não foi possível abrir a sessão: faltam componentes.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de transferência</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>Receber</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>Enviar ficheiro</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>Protocolo de Transferência</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>Progresso</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>Preparado</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>Iniciar transferência</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>Transferir ficheiro</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Atenção</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi especificado nenhum ficheiro.</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>A enviar...</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>A receber...</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>Cancelado</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>A transferência do ficheiro foi cancelada.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Operação não suportada.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível iniciar a transferência.</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>Nenhum erro.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um erro indefinido.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>Transferência incompleta.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>Ocorreu um erro desconhecido.</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>Enviado</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>O ficheiro foi enviado.</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>Recebido</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>O ficheiro foi recebido.</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>Nome do perfil</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>Perfil</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Ligação</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>Teclas Especiais</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>Perfil inválido</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza um nome para o perfil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>Série</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>Consola Local</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>Terminal por Omissão</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>Teclado por Omissão</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation>Ficheiro Sincronizado</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>A marcar número: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falhou</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation>Falhou a marcação do número.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation>A cancelar...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>À procura do modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Iniciando...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar Colunas</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>A desligar o tom de ligação</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>Ligar ao número</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>Número ocupado, a remarcar</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>Ligação estabelecida</translation>
     </message>
     <message>
         <source>Dismiss</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo de Terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Esquema de cores</translation>
     </message>
     <message>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
         <source>small</source>
         <translation>pequena</translation>
     </message>
     <message>
         <source>medium</source>
         <translation>média</translation>
     </message>
     <message>
         <source>large</source>
         <translation>grande</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
+        <translation>Conversão de quebras de linhas</translation>
     </message>
     <message>
         <source>Inbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrada</translation>
     </message>
     <message>
         <source>Outbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Saída</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>Eco local</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>Quebra de linha</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>Consola Linux</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>Terminal X</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>preto em branco</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>branco em preto</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>verde em preto</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>laranja em preto</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opie-login.ts b/i18n/pt/opie-login.ts
index 4674a11..729b211 100644
--- a/i18n/pt/opie-login.ts
+++ b/i18n/pt/opie-login.ts
@@ -1,85 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toque na cruz com firmeza e 
+precisão para calibrar o ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bem vindo ao Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrar</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;Bem-Vindo ao Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilizador</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Palavra chave inválida</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A palavra chave é incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>O OPIE terminou 
+        <translation type="obsolete">O OPIE terminou 
 devido a um sinal
 de sistema (%1)</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>Não foi possível iniciar o OPIE.</translation>
+        <translation type="obsolete">Não foi possível iniciar o OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível usar essa conta</translation>
+    </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>Não foi possível usar essa conta.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opie-write.ts b/i18n/pt/opie-write.ts
index fe6a8a6..af156d8 100644
--- a/i18n/pt/opie-write.ts
+++ b/i18n/pt/opie-write.ts
@@ -1,116 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>File</source>
-        <translation type="unfinished">Ficheiro</translation>
+        <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Desfazer</translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Refazer</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Negrito</translation>
     </message>
     <message>
         <source>Italic</source>
         <translation>Itálico</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>&amp;Itálico</translation>
     </message>
     <message>
         <source>Underline</source>
         <translation>Sublinhado</translation>
     </message>
     <message>
         <source>&amp;Underline</source>
         <translation>&amp;Sublinhado</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Center</source>
         <translation>Centro</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Justificado</translation>
     </message>
     <message>
         <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem nome</translation>
     </message>
 </context>
 <context>
     <name>QTextEdit</name>
     <message>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Desfazer</translation>
     </message>
     <message>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Refazer</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor&amp;tar</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Copiar</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Co&amp;lar</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionar Tudo</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieftp.ts b/i18n/pt/opieftp.ts
index 8f9d52e..61f8d01 100644
--- a/i18n/pt/opieftp.ts
+++ b/i18n/pt/opieftp.ts
@@ -1,235 +1,248 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie FTP</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação</translation>
     </message>
     <message>
         <source>Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Local</translation>
     </message>
     <message>
         <source>Remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Remoto</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligar</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar Ficheiros Escondidos</translation>
     </message>
     <message>
         <source>Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Make Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar Directoria</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>Puxar</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para Local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para Remoto</translation>
     </message>
     <message>
         <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar para Configuração</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <source>Dir</source>
-        <translation type="unfinished"></translation>
+        <translation>Directoria</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation>Conta</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Remote server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor Remoto</translation>
     </message>
     <message>
         <source>Remote path</source>
-        <translation type="unfinished"></translation>
+        <translation>Directoria Remota</translation>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation>Porta</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração</translation>
     </message>
     <message>
         <source>Ftp</source>
-        <translation type="unfinished"></translation>
+        <translation>FTP</translation>
     </message>
     <message>
         <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
+        <translation>Preencha a informação do servidor</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível ligar a
+</translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível autenticar em</translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível enviar
+</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
+        <translation>Não é possível enviar directorias</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível puxar
+</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mostrar directoria
+</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mudar de directoria
+</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mudar para a directoria acima
+</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível saber a directoria actual
+</translation>
     </message>
     <message>
         <source>Change Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Directoria</translation>
     </message>
     <message>
         <source>Rescan</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-ler</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer apagar
+</translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
-        <translation type="unfinished"></translation>
+        <translation>?
+Tem de estar vazia</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível criar directoria
+</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível apagar directoria
+</translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível apagar ficheiro
+</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível mudar nome de ficheiro
+</translation>
     </message>
     <message>
         <source>Could not rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Não é possível mudar nome</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
+        <translation>A directoria não existe</translation>
     </message>
     <message>
         <source>New Server name</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo nome de servidor</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome já existe</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieirc.ts b/i18n/pt/opieirc.ts
index 33ef781..33682f7 100644
--- a/i18n/pt/opieirc.ts
+++ b/i18n/pt/opieirc.ts
@@ -1,510 +1,516 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
+        <translation>A falar no canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal de discussão</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Escreva aqui as suas mensagens para participar na discussão deste canal</translation>
     </message>
     <message>
         <source>CTCP</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
-        <translation type="unfinished"></translation>
+        <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Versão</translation>
     </message>
     <message>
         <source>Whois</source>
-        <translation type="unfinished"></translation>
+        <translation>Whois</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligado, a autenticar..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Autenticado.</translation>
     </message>
     <message>
         <source>Socket error : </source>
-        <translation type="unfinished"></translation>
+        <translation>Erro na ligação:</translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação terminada</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Entrou num canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta pessoa já tinha entrado no canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Já tinha entrado neste canal - de-sincronizado?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>A pessoa que saiu não foi encontrada - de-sincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Saiu de um canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagem no canal sem originador conhecido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagem privada de tipo desconhecido</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
+        <translation>Alteração de alcunha de um utilizador desconhecido</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Saiu um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
-        <translation type="unfinished"></translation>
+        <translation>tópico alterado para</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tópico de canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
-        <translation type="unfinished"></translation>
+        <translation>Recebido um CTCP PING de</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
+        <translation>Recebido um VERSÃO CTCP  de</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Acção CTCP de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Acção CTCP de um canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>Acção CTCP com destinatário inválido</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudança de modo de tipo desconhecido</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudança de modo de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudança de modo de &quot;flag&quot; desconhecida</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudança de modo com &quot;kannel&quot; desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Modos de utilizador ainda não suportados</translation>
     </message>
     <message>
         <source>You were kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>Foi expulsado de</translation>
     </message>
     <message>
         <source> by </source>
-        <translation type="unfinished"></translation>
+        <translation>por</translation>
     </message>
     <message>
         <source> was kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>foi expulsado de</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Expulsão de um utilizador desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Expulsão de um canal desconhecido - de-sincronização?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagem do servidor de um canal desconhecido</translation>
     </message>
     <message>
         <source>You joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Entrou no canal</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>A alcunha já está a ser usada. Escolha uma alcunha diferente e volte a ligar-se</translation>
     </message>
     <message>
         <source>No such nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Alcunha desconhecida</translation>
+    </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>Recebido um comando numérico desconhecido: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>Recebido um comando CTCP desconhecido: %1</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>Recebido um comando literal desconhecido: %1</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>%1 entrou no canal %2</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>Saíu do canal %1</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>%1 saíu do canal %2</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>Mensagem de canal de um canal desconhecido %1</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>A sua alcunha mudou para %1</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>%1 mudou a alcunha para %2</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>%1 saíu (%2)</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
-        <translation type="unfinished"></translation>
+        <translation>A falar em</translation>
     </message>
     <message>
         <source>Private discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Conversa privada</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
-        <translation type="unfinished"></translation>
+        <translation>Escreva aqui o texto a ser enviado ao outro utilizador</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligado</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do perfil:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome do perfil do servidor a mostrar no resumo</translation>
     </message>
     <message>
         <source>Hostname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>O servidor a ligar - pode ser um nome ou um endereço IP</translation>
     </message>
     <message>
         <source>Port :</source>
-        <translation type="unfinished"></translation>
+        <translation>Porta:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
-        <translation type="unfinished"></translation>
+        <translation>A porta do servidor a ligar. Geralmente a 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Alcunha:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
-        <translation type="unfinished"></translation>
+        <translation>A sua alcunha na rede do IRC</translation>
     </message>
     <message>
         <source>Realname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Your real name</source>
-        <translation type="unfinished"></translation>
+        <translation>O seu nome real</translation>
     </message>
     <message>
         <source>Password :</source>
-        <translation type="unfinished"></translation>
+        <translation>Palavra Chave:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
-        <translation type="unfinished"></translation>
+        <translation>A password para ligar ao servidor (se necessário)</translation>
     </message>
     <message>
         <source>Channels :</source>
-        <translation type="unfinished"></translation>
+        <translation>Canais:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de canais a entrar automaticamente, separados por vírgulas</translation>
     </message>
     <message>
         <source>Edit server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar informação do servidor</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <source>Profile name required</source>
-        <translation type="unfinished"></translation>
+        <translation>É necessário um nome para o perfil</translation>
     </message>
     <message>
         <source>Host name required</source>
-        <translation type="unfinished"></translation>
+        <translation>É necessário um servidor</translation>
     </message>
     <message>
         <source>Port required</source>
-        <translation type="unfinished"></translation>
+        <translation>É necessária uma porta</translation>
     </message>
     <message>
         <source>Nickname required</source>
-        <translation type="unfinished"></translation>
+        <translation>É necessário uma alcunha</translation>
     </message>
     <message>
         <source>Realname required</source>
-        <translation type="unfinished"></translation>
+        <translation>É necessário um nome</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>A lista de canais deverá conter nomes
+de canais separados por vírgulas. Os 
+nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidores</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha um perfil de servidor</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha um perfil de servidor desta lista e depois escolha Ok</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar um perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação a</translation>
     </message>
     <message>
         <source>Server messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Mensagens do servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
-        <translation type="unfinished"></translation>
+        <translation>Escreva comandos aqui. A lista de comandos está disponível na ajuda do OpieIRC</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
-        <translation type="unfinished"></translation>
+        <translation>Linhas mostradas:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
-        <translation type="unfinished"></translation>
+        <translation>Quantidade de linhas a mostrar nas conversas antes que as linhas antigas sejam apagadas - isto é necessário para reduzir o consumo de memória. Escolha 0 se não necessitar esta funcionalidade</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Geral</translation>
     </message>
     <message>
         <source>Background color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do fundo:</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor de fundo a usar nas conversas</translation>
     </message>
     <message>
         <source>Normal text color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto a usar nas conversas</translation>
     </message>
     <message>
         <source>Error color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor dos erros:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto a usar para erros</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto escrito por si:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto escrito a usar para identificar o texto escrito por si</translation>
     </message>
     <message>
         <source>Text written by others :</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto escrito por outros:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto escrito a usar para identificar o texto escrito por outros</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto escrito pelo servidor:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto escrito a usar para identificar o texto escrito pelo servidor</translation>
     </message>
     <message>
         <source>Notifications :</source>
-        <translation type="unfinished"></translation>
+        <translation>Notificações:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor do texto a usar para notificações</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Cores</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição em falta</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição do conteúdo da pasta</translation>
     </message>
     <message>
         <source>Close this tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar esta pasta</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation type="unfinished"></translation>
+        <translation>Cliente IRC</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligações ao servidor, canais, perguntas e outras coisas estarão aqui</translation>
     </message>
     <message>
         <source>IRC</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova ligação</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Criar uma nova ligação a um servidor IRC</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar o comportamento e aparência do OpieIRC</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opiemail.ts b/i18n/pt/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/pt/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/opieplayer.ts b/i18n/pt/opieplayer.ts
index b8f82ba..11ead74 100644
--- a/i18n/pt/opieplayer.ts
+++ b/i18n/pt/opieplayer.ts
@@ -1,268 +1,264 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um erro ao
+aceder ao dispositivo de
+som. (/dev/dsp)
+</translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
-        <translation type="unfinished"></translation>
+        <translation>
+
+A sair.</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abortar</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>OpiePlayer</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum ficheiro</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro: nenhum ficheiro selecionado</translation>
     </message>
     <message>
         <source>File not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro não encontrado</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>O ficheiro não foi encontrado: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum descodificador encontrado</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi encontrado nenhum descodificador para este tipo de ficheiro: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao abrir o ficheiro</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um erro ao tocar o ficheiro: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro:</translation>
     </message>
     <message>
         <source>, Length: </source>
-        <translation type="unfinished"></translation>
+        <translation>, Tamanho:</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Volume</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecção da Lista</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Operações</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar à Lista</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar da Lista</translation>
     </message>
     <message>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Tocar</translation>
     </message>
     <message>
         <source>Randomize</source>
-        <translation type="unfinished"></translation>
+        <translation>Aleatório</translation>
     </message>
     <message>
         <source>Loop</source>
-        <translation type="unfinished"></translation>
+        <translation>Ciclo</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Clear List</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar Lista</translation>
     </message>
     <message>
         <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar todos os ficheiros de áudio</translation>
     </message>
     <message>
         <source>Add all video files</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar todos os ficheiros de vídeo</translation>
     </message>
     <message>
         <source>Add all files</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar todos os ficheiros</translation>
     </message>
     <message>
         <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Lista</translation>
     </message>
     <message>
         <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir Ficheiro ou URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar Ficheiros Áudio</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar Ficheiros Vídeo</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar</translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover Acima</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover Abaixo</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <source>Media</source>
-        <translation type="unfinished"></translation>
+        <translation>Média</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Áudio</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Vídeo</translation>
     </message>
     <message>
         <source>Lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Listas</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
+        <translation>OpiePlayer:</translation>
     </message>
     <message>
         <source>Invalid File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro Inválido</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ocorreu um problema ao aceder ao ficheiro.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover Lista?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tem a certeza que quer 
+apagar esta lista?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriedades</translation>
     </message>
     <message>
         <source>Play Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Tocas as Selecionadas</translation>
     </message>
     <message>
         <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir ficheiro ou URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Lista m3u</translation>
     </message>
     <message>
         <source>Skins</source>
-        <translation type="unfinished"></translation>
+        <translation>Temas</translation>
     </message>
     <message>
         <source>Path</source>
-        <translation type="unfinished"></translation>
+        <translation>Directoria</translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
+        <translation>OpiePlayer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/opieplayer2.ts b/i18n/pt/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/pt/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/opierec.ts b/i18n/pt/opierec.ts
new file mode 100644
index 0000000..6602e76
--- a/dev/null
+++ b/i18n/pt/opierec.ts
@@ -0,0 +1,210 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Próximo</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>Gravador Opie</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>Ficheiros</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>44100</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>32000</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>22050</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>16000</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>11025</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>8000</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>Limitar Tamanho</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>Sem Limite</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>Directoria</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>Qualidade</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>16bits</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>8bits</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>Entrada</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>Saída</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>Pouco Espaço em Disco</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>Está a ficar com pouco 
+espaço livre</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>Tem a certeza que quer apagar o ficheiro seleccionado?</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>Sim</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>Não</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>Não foi possível apagar o ficheiro.</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>Gravador Opie</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>Escolha o ficheiro a tocar</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>Nota</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>Não foi possível abrir o ficheiro àudio.
+</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>Tocar</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>Irradiar</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>Mudar Nome</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>A Irradiar</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>Irradiado.</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>Gravar</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>Localização</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>Compressão (ficheiros mais pequenos)</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>Silêncio Automático</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>Silêncio</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>Parar</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/osearch.ts b/i18n/pt/osearch.ts
new file mode 100644
index 0000000..11b65aa
--- a/dev/null
+++ b/i18n/pt/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>Procurar</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Procurar</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>Procurar Tudo</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>Sensível a letras grandes/pequenas</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>Usas expressões</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>Os detalhes da procura actual</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configurações</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>Opções</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>Introduza os termos a procurar aqui</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>Aplicações</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>Lista de Tarefas</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Calendário</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>Contactos</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>Resultados</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>mostrar</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>editar</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>executar</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>abrir no gestor de ficheiros</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>abrir com</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>mostrar tarefas completas</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>mostrar eventos do passado</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>procurar nas datas</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>Ficheiro:</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>Ligação:</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>Tipo de Conteúdo:</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>procurar conteúdo</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>a procurar %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/oxygen.ts b/i18n/pt/oxygen.ts
index 05f69c0..a1050fd 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -1,563 +1,563 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calcular</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Molecular Weight</source>
         <translation>Peso Molecular</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Fórmula Química</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Peso Molecular (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composição Elementar (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Block</source>
         <translation>Bloco</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electro-negatividade</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raio Atómico</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>Energia de Ionização</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>Densidade</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>Ponto de Fervura</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>Ponto de Derretimento</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxigénio</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>Dados</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>Cálculos</translation>
     </message>
     <message>
         <source>Hydrogen</source>
         <translation>Hidrogénio</translation>
     </message>
     <message>
         <source>Helium</source>
         <translation>Hélio</translation>
     </message>
     <message>
         <source>Lithium</source>
         <translation>Lítio</translation>
     </message>
     <message>
         <source>Beryllium</source>
         <translation>Berílio</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation type="unfinished"></translation>
+        <translation>Boro</translation>
     </message>
     <message>
         <source>Carbon</source>
         <translation>Carbono</translation>
     </message>
     <message>
         <source>Nitrogen</source>
         <translation>Nitrogénio</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>Fluor</translation>
+        <translation>Flúor</translation>
     </message>
     <message>
         <source>Neon</source>
         <translation>Néon</translation>
     </message>
     <message>
         <source>Sodium</source>
         <translation>Sódio</translation>
     </message>
     <message>
         <source>Magnesium</source>
         <translation>Magnésio</translation>
     </message>
     <message>
         <source>Aluminum</source>
         <translation>Alumínio</translation>
     </message>
     <message>
         <source>Silicon</source>
         <translation>Silício</translation>
     </message>
     <message>
         <source>Phosphorus</source>
         <translation>Fósforo</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>Sulfato</translation>
+        <translation>Enxofre</translation>
     </message>
     <message>
         <source>Chlorine</source>
         <translation>Cloro</translation>
     </message>
     <message>
         <source>Argon</source>
         <translation>Árgon</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>Potásio</translation>
+        <translation>Potássio</translation>
     </message>
     <message>
         <source>Calcium</source>
         <translation>Cálcio</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation type="unfinished"></translation>
+        <translation>Escândio</translation>
     </message>
     <message>
         <source>Titanium</source>
         <translation>Titânio</translation>
     </message>
     <message>
         <source>Vanadium</source>
         <translation>Vanádio</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>Crômio</translation>
+        <translation>Crómio</translation>
     </message>
     <message>
         <source>Manganese</source>
         <translation>Manganésio</translation>
     </message>
     <message>
         <source>Iron</source>
         <translation>Ferro</translation>
     </message>
     <message>
         <source>Cobalt</source>
         <translation>Cobalto</translation>
     </message>
     <message>
         <source>Nickel</source>
         <translation>Níquel</translation>
     </message>
     <message>
         <source>Copper</source>
         <translation>Cobre</translation>
     </message>
     <message>
         <source>Zinc</source>
         <translation>Zinco</translation>
     </message>
     <message>
         <source>Gallium</source>
         <translation>Gálio</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation>Germâno</translation>
+        <translation>Germânio</translation>
     </message>
     <message>
         <source>Arsenic</source>
         <translation>Arsénico</translation>
     </message>
     <message>
         <source>Selenium</source>
         <translation>Selénio</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation type="unfinished"></translation>
+        <translation>Bromo</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation>Cripton</translation>
+        <translation>Krípton</translation>
     </message>
     <message>
         <source>Rubidium</source>
         <translation>Rubídio</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation type="unfinished"></translation>
+        <translation>Estrôncio</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ítrio</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation type="unfinished"></translation>
+        <translation>Zircónio</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation type="unfinished"></translation>
+        <translation>Nióbio</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
+        <translation>Molibdénio</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation type="unfinished"></translation>
+        <translation>Tecnécio</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruténio</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ródio</translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation type="unfinished"></translation>
+        <translation>Paládio</translation>
     </message>
     <message>
         <source>Silver</source>
         <translation>Prata</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation type="unfinished">Cadmio</translation>
+        <translation>Cádmio</translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation type="unfinished"></translation>
+        <translation>Índio</translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation type="unfinished"></translation>
+        <translation>Estanho</translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation type="unfinished"></translation>
+        <translation>Antimónio</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation type="unfinished"></translation>
+        <translation>Telúrio</translation>
     </message>
     <message>
         <source>Iodine</source>
         <translation>Iodo</translation>
     </message>
     <message>
         <source>Xenon</source>
         <translation>Xénon</translation>
     </message>
     <message>
         <source>Cesium</source>
         <translation>Césio</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation type="unfinished"></translation>
+        <translation>Bário</translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
+        <translation>Lantânio</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation type="unfinished"></translation>
+        <translation>Cério</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
+        <translation>Praseodímio</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation type="unfinished"></translation>
+        <translation>Neodímio</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation type="unfinished"></translation>
+        <translation>Promécio</translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation type="unfinished"></translation>
+        <translation>Samário</translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation type="unfinished"></translation>
+        <translation>Európio</translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Gadolíneo</translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Térbio</translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
+        <translation>Disprósio</translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation type="unfinished"></translation>
+        <translation>Holmio</translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Érbio</translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation type="unfinished"></translation>
+        <translation>Túlio</translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
+        <translation>Itérbio</translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation type="unfinished"></translation>
+        <translation>Lutécio</translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation type="unfinished"></translation>
+        <translation>Háfnio</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation type="unfinished"></translation>
+        <translation>Tântalo</translation>
     </message>
     <message>
         <source>Tungsten</source>
         <translation>Tungsténio</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rénio</translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation type="unfinished"></translation>
+        <translation>Ósmio</translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation type="unfinished"></translation>
+        <translation>Irídiu</translation>
     </message>
     <message>
         <source>Platinum</source>
         <translation>Platina</translation>
     </message>
     <message>
         <source>Gold</source>
         <translation>Ouro</translation>
     </message>
     <message>
         <source>Mercury</source>
         <translation>Mercúrio</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation type="unfinished"></translation>
+        <translation>Tálio</translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation type="unfinished"></translation>
+        <translation>Chumbo</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation type="unfinished"></translation>
+        <translation>Bismuto</translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation type="unfinished"></translation>
+        <translation>Polónio</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation type="unfinished"></translation>
+        <translation>Astato</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation type="unfinished"></translation>
+        <translation>Rádon</translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation type="unfinished"></translation>
+        <translation>Frâncio</translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rádio</translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Actínio</translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation type="unfinished"></translation>
+        <translation>Tório</translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Protacnídio</translation>
     </message>
     <message>
         <source>Uranium</source>
         <translation>Urânio</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation type="unfinished">Neptu</translation>
+        <translation>Neptúnio</translation>
     </message>
     <message>
         <source>Plutonium</source>
         <translation>Plutónio</translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation type="unfinished"></translation>
+        <translation>Amerício</translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation type="unfinished"></translation>
+        <translation>Cúrio</translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation type="unfinished"></translation>
+        <translation>Berquélio</translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation type="unfinished"></translation>
+        <translation>Califórnio</translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstânio</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation type="unfinished"></translation>
+        <translation>Férmio</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
+        <translation>Mendeleévio</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation type="unfinished"></translation>
+        <translation>Nobélio</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
+        <translation>Lawrêncio</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
+        <translation>Rutherfórdio</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation type="unfinished"></translation>
+        <translation>Dúbnio</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
+        <translation>Seabórguio</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation type="unfinished"></translation>
+        <translation>Bóhrio</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation type="unfinished"></translation>
+        <translation>Hássio</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
+        <translation>Meitnério</translation>
     </message>
 </context>
 <context>
     <name>PSEWidget</name>
     <message>
         <source>Periodic System</source>
         <translation>Tabela Periódica</translation>
     </message>
 </context>
 <context>
     <name>calcDlgUI</name>
     <message>
         <source>ERROR: 
 </source>
         <translation>Erro:
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Dados Químicos
 </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/patience.ts b/i18n/pt/patience.ts
index 8df3f98..10fbbeb 100644
--- a/i18n/pt/patience.ts
+++ b/i18n/pt/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Paciência</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Mudar Cartas</translation>
+        <translation type="obsolete">&amp;Mudar Cartas</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;Ir Para Posição</translation>
+        <translation type="obsolete">&amp;Ir Para Posição</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Parâmetros</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>A&amp;juda</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jogar</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Mudar Cartas</translation>
+        <translation type="obsolete">Mudar Cartas</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Ir Para Posição</translation>
+        <translation type="obsolete">Ir Para Posição</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Virar Uma Carta</translation>
+        <translation type="obsolete">Virar Uma Carta</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Virar Três Cartas</translation>
+        <translation type="obsolete">Virar Três Cartas</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harpa</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>&amp;Mudar o desenho das cartas</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>&amp;Ajustar à posição</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>Mudar o desenho das cartas</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>Ajustar à posição</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>Virar uma carta</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation>Virar três cartas</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/qpdf.ts b/i18n/pt/qpdf.ts
index dd6bcf8..dc755bc 100644
--- a/i18n/pt/qpdf.ts
+++ b/i18n/pt/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Zoom</translation>
     </message>
     <message>
         <source>Fit to width</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar à largura</translation>
     </message>
     <message>
         <source>Fit to page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar ao tamanho da página</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Abrir...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Primeira página</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Página anterior</translation>
     </message>
     <message>
         <source>Goto page...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir para a página...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Página seguinte</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Última página</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Próxima</translation>
     </message>
     <message>
         <source>Goto page</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir para a página</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionado de 1 .. %1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi encontrado o &apos;%1&apos;.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
+        <source>File does not exist!</source>
+        <translation>O ficheiro não existe!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 37db7fb..4e02e16 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,252 +1,257 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation type="unfinished"></translation>
+        <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toque na cruz com firmeza e 
+precisão para calibrar o ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Bem-vindo ao Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista em Lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia está muito baixo.
+Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia está baixo.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nível de energia da bateria extra está baixo.
+Deve carregá-la.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;A data do sistema não parece ser válida.
+(%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>Execução</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <translation>A procurar nos documentos</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ficheiros</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os tipos de ficheiros</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Documentos</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão inserido</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
+        <translation>Foi inserido um cartão. Quer indexar os ficheiros dele?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <translation>Que tipos de ficheiros</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Àudio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Imagem</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Vídeo</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicações</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
+        <translation>Limitar a procura à directoria: (por implementar)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
+        <translation>A sua decisão será guardada no cartão.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Não perguntar novamente para este cartão</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>Estado da Bateria</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminar o Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar Dispositivo</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desligar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;
+Estas operações estão disponíveis principalmente para desenvolvimento e testes do sistema Opie. Num ambiente normal, estes conceitos são desnecessários.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
+        <translation>A desligar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Ligação de Sincronização</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;É normal se for o primeiro acesso para sincronização.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"></translation>
+        <translation>Permitir</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>A sincronizar</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/reader.ts b/i18n/pt/reader.ts
index 4d52761..af0a2ac 100644
--- a/i18n/pt/reader.ts
+++ b/i18n/pt/reader.ts
@@ -1,664 +1,793 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CBarPrefs</name>
     <message>
         <source>Toolbar Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações da Barra de Ferramentas</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
     <message>
         <source>Indicators</source>
         <translation>Indicadores</translation>
     </message>
     <message>
         <source>Policy</source>
         <translation>Política</translation>
     </message>
 </context>
 <context>
     <name>CButtonPrefs</name>
     <message>
         <source>Scroll Speed</source>
         <translation>Velocidade de Deslizamento</translation>
     </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation>&lt;Nenhum&gt;</translation>
+    </message>
+    <message>
+        <source>Open file</source>
+        <translation>Abrir ficheiro</translation>
+    </message>
+    <message>
+        <source>Autoscroll</source>
+        <translation>Deslizamento Automático</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Atalho</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>Anotar</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>Ecrâ Todo</translation>
+    </message>
+    <message>
+        <source>Zoom in</source>
+        <translation>Aproximar</translation>
+    </message>
+    <message>
+        <source>Zoom out</source>
+        <translation>Afastar</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Voltar</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Próximo</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Início</translation>
+    </message>
+    <message>
+        <source>Page up</source>
+        <translation>Página Anterior</translation>
+    </message>
+    <message>
+        <source>Page down</source>
+        <translation>Página Seguinte</translation>
+    </message>
+    <message>
+        <source>Line up</source>
+        <translation>Linha Acima</translation>
+    </message>
+    <message>
+        <source>Line down</source>
+        <translation>Linha Abaixo</translation>
+    </message>
+    <message>
+        <source>Beginning</source>
+        <translation>Início</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Fim</translation>
+    </message>
+    <message>
+        <source>Escape Button</source>
+        <translation>Botão de Escape</translation>
+    </message>
+    <message>
+        <source>Space Button</source>
+        <translation>Botão de Espaço</translation>
+    </message>
+    <message>
+        <source>Return Button</source>
+        <translation>Botão de Enter</translation>
+    </message>
+    <message>
+        <source>Left Arrow</source>
+        <translation>Seta Esquerda</translation>
+    </message>
+    <message>
+        <source>Right Arrow</source>
+        <translation>Seta Direita</translation>
+    </message>
+    <message>
+        <source>Down Arrow</source>
+        <translation>Seta Baixo</translation>
+    </message>
+    <message>
+        <source>Up Arrow</source>
+        <translation>Seta Cima</translation>
+    </message>
 </context>
 <context>
     <name>CCloseDialog</name>
     <message>
         <source>Tidy-up</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Delete Bookmarks</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar Atalhos</translation>
     </message>
     <message>
         <source>Delete Configuration</source>
         <translation>Apagar Configuração</translation>
     </message>
 </context>
 <context>
     <name>CFileBarPrefs</name>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Up
+Toque</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
 </context>
 <context>
     <name>CIndBarPrefs</name>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
 </context>
 <context>
     <name>CInterPrefs</name>
     <message>
         <source>International</source>
         <translation>Internacional</translation>
     </message>
     <message>
         <source>Ideograms</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramas</translation>
     </message>
     <message>
         <source>Ideogram Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Largura das Ideogramas</translation>
     </message>
     <message>
         <source>Apply font
 to dialogs</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplicar fontes
+aos diálogos</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificação</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Um
+Toque</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>Dicionário</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>Mudar Acção
+do Toque</translation>
     </message>
 </context>
 <context>
     <name>CLayoutPrefs</name>
     <message>
         <source>Strip CR</source>
         <translation>Remover CR</translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation>Remover Hífens</translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation>Espaço Simples</translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation>Remover Identação</translation>
     </message>
     <message>
         <source>Reparagraph</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-paragrafar</translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation>Espaço Duplo</translation>
     </message>
     <message>
         <source>Remap</source>
-        <translation type="unfinished"></translation>
+        <translation>Re-mapear</translation>
     </message>
     <message>
         <source>Embolden</source>
-        <translation type="unfinished"></translation>
+        <translation>Mais escuro</translation>
     </message>
     <message>
         <source>Full Justify</source>
         <translation>Justificação Completa</translation>
     </message>
+    <message>
+        <source>Text</source>
+        <translation>Texto</translation>
+    </message>
 </context>
 <context>
     <name>CLayoutPrefs2</name>
     <message>
         <source>Indent</source>
         <translation>Identar</translation>
     </message>
     <message>
         <source>Page
 Overlap</source>
-        <translation type="unfinished"></translation>
+        <translation>Sobrepor
+Páginas</translation>
     </message>
     <message>
         <source>Graphics
 Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar os
+Gráficos</translation>
     </message>
     <message>
         <source>Margin</source>
         <translation>Margem</translation>
     </message>
     <message>
         <source>Paragraph
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Identação
+do Parágrafo</translation>
     </message>
     <message>
         <source>Line
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Identação
+da Linha</translation>
     </message>
     <message>
         <source>Markup</source>
-        <translation type="unfinished"></translation>
+        <translation>Marcas</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
 </context>
 <context>
     <name>CMarkBarPrefs</name>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anotar</translation>
     </message>
     <message>
         <source>Goto</source>
-        <translation type="unfinished">Ir Para</translation>
+        <translation>Ir Para</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerar Automaticamente</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Mark Block</source>
         <translation>Marcar Bloco</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copiar Bloco</translation>
     </message>
 </context>
 <context>
     <name>CMiscBarPrefs</name>
     <message>
         <source>Floating</source>
-        <translation type="unfinished"></translation>
+        <translation>Flutuar</translation>
     </message>
     <message>
         <source>Single bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Uma barra</translation>
     </message>
     <message>
         <source>Menu/tool bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu/barra</translation>
     </message>
     <message>
         <source>Multiple bars</source>
-        <translation type="unfinished"></translation>
+        <translation>Múltiplas barras</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Topo</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Final</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Minimised</source>
         <translation>Minimizar</translation>
     </message>
     <message>
         <source>Movable</source>
-        <translation type="unfinished"></translation>
+        <translation>Amovível</translation>
     </message>
 </context>
 <context>
     <name>CMiscPrefs</name>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation>Dicionário</translation>
     </message>
     <message>
         <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Clipboard</translation>
     </message>
     <message>
         <source>Depluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Des-depenar</translation>
     </message>
     <message>
         <source>Dejpluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Des-depenar</translation>
     </message>
     <message>
         <source>Continuous</source>
         <translation>Contínuo</translation>
     </message>
+    <message>
+        <source>Select Action</source>
+        <translation>Seleccione Acção</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>Depenar</translation>
+    </message>
 </context>
 <context>
     <name>CNavBarPrefs</name>
     <message>
         <source>Scroll</source>
         <translation>Deslizar</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo</translation>
     </message>
     <message>
         <source>Page Up</source>
         <translation>Página Anterior</translation>
     </message>
     <message>
         <source>Page Down</source>
         <translation>Página Seguinte</translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation>Ir Para Início</translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation>Ir Para Fim</translation>
     </message>
     <message>
         <source>Jump</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar por página/linha</translation>
     </message>
 </context>
 <context>
     <name>CPrefs</name>
     <message>
         <source>OpieReader Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações do OpieReader</translation>
     </message>
     <message>
         <source>Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <source>Layout(2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo(2)</translation>
     </message>
     <message>
         <source>Locale</source>
-        <translation type="unfinished"></translation>
+        <translation>Localização</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Buttons</source>
         <translation>Botões</translation>
     </message>
 </context>
 <context>
     <name>CURLDialog</name>
     <message>
         <source>Save URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar URL</translation>
     </message>
     <message>
         <source>Clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Clipboard</translation>
     </message>
     <message>
         <source>Local file</source>
         <translation>Ficheiro local</translation>
     </message>
     <message>
         <source>Global file</source>
         <translation>Ficheiro global</translation>
     </message>
 </context>
 <context>
     <name>CViewBarPrefs</name>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Fonte</translation>
     </message>
     <message>
         <source>Encoding</source>
         <translation>Codificação</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideograma</translation>
     </message>
 </context>
 <context>
     <name>QTReaderApp</name>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source>Navigation</source>
         <translation>Navegação</translation>
     </message>
     <message>
         <source>Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar</translation>
     </message>
     <message>
         <source>Jump</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizar por página/linha</translation>
     </message>
     <message>
         <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Dois/Um Toque</translation>
     </message>
     <message>
         <source>Annotation</source>
         <translation>Anotação</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Procurar...</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Set Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Fonte</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>Anotar</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>Ir Para</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Autogen</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerar Automaticamente</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Tidy</source>
-        <translation type="unfinished"></translation>
+        <translation>Arrumar</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>Início do Bloco</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>Copiar Bloco</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Marcas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Procurar Próximo</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Procura</translation>
     </message>
     <message>
         <source>Do Reg</source>
-        <translation type="unfinished"></translation>
+        <translation>Registar</translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation>Fechar Edição</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
         <source>Save Config</source>
         <translation>Gravar Configuração</translation>
     </message>
     <message>
         <source>Load Config</source>
         <translation>Ler Configuração</translation>
     </message>
     <message>
         <source>Delete Config</source>
         <translation>Apagar Configuração</translation>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Barras de Ferramentas</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Executar script</translation>
     </message>
     <message>
         <source>Export Links</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar Ligações</translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation>Ir Para o Início</translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation>Ir Para o Fim</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Próximo</translation>
     </message>
     <message>
         <source>Scrolling</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslizamento</translation>
     </message>
     <message>
         <source>Set Target</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolher Destino</translation>
     </message>
     <message>
         <source>Pause Paras</source>
-        <translation type="unfinished"></translation>
+        <translation>Parar Parágrafos</translation>
     </message>
     <message>
         <source>Set Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Codificação</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideograma</translation>
     </message>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>Leitor</translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar ficheiro</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Escondidos</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/rotation.ts b/i18n/pt/rotation.ts
deleted file mode 100644
index 55ef2a6..0000000
--- a/i18n/pt/rotation.ts
+++ b/dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Rodar Ecrâ</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>Escolha a orientação nas 
-opções da esquerda.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>Reiniciar o Opie?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;A rotação não está disponível nesta demo, no entanto é suportado no Qt/Embedded.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index b76882f..b352ee1 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -1,105 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar Chave</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza chave</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
+        <translation>Chave incorrecta</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
-        <translation type="unfinished"></translation>
+        <translation>A chave introduzida está incorrecta.
+Acesso negado</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Nenhum</translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza nova chave</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Reintroduza a chave</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configurações de Segurança</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar chave</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
+        <translation>Pedir chave ao ligar</translation>
     </message>
     <message>
         <source>Sync</source>
-        <translation type="unfinished"></translation>
+        <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.129.0/24 (omissão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
+        <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
+        <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
+        <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation type="unfinished"></translation>
+        <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished"></translation>
+        <translation>1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation>Palavra Chave</translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation>Entrar</translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation>Entrar Automaticamente</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sheetqt.ts b/i18n/pt/sheetqt.ts
index a498eb4..309c19d 100644
--- a/i18n/pt/sheetqt.ts
+++ b/i18n/pt/sheetqt.ts
@@ -1,797 +1,797 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
         <translation>&amp;Contornos</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
         <translation>&amp;Fundo</translation>
     </message>
     <message>
         <source>&amp;Font</source>
         <translation>&amp;Fonte</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
         <translation>&amp;Alinhamento</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
         <translation>&amp;Largura:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
         <translation>&amp;Cor:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
         <translation>Contornos por &amp;Omissão</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
         <translation>E&amp;stilo:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
         <translation>&amp;Fundo por Omissão</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
         <translation>&amp;Fonte:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
         <translation>&amp;Tamanho:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
         <translation>&amp;Negrito</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>&amp;Itálico</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
         <translation>Fonte por &amp;Omissão</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
         <translation>&amp;Vertical:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
         <translation>&amp;Horizontal:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
         <translation>&amp;Quebra de Linha</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
         <translation>Alinhamento por &amp;Omissão</translation>
     </message>
     <message>
         <source>Format Cells</source>
         <translation>Formatar Células</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
         <translation>Folha de Cálculo</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>&amp;Procurar &amp;&amp; Substituir</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>&amp;Opções</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
         <translation>&amp;Procurar por:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
         <translation>&amp;Substituir por:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>&amp;Procurar</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
         <translation>&amp;Substituir</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
         <translation>Substituir &amp;tudo</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>Procura &amp;exacta</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>Apenas &amp;Selecção actual</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>&amp;Célula toda</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>Procurar &amp; Substituir</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Folha de Cálculo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>Erro de inconsistência!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>Não foi possível gravar o ficheiro!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>Não foi possível abrir o ficheiro!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>Formato de ficheiro inválido!</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>Gravar Ficheiro</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>Deseja gravar o ficheiro actual?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>Nome do &amp;Ficheiro:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>SemNome</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>Ficheiro Novo</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Novo</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>&amp;Abrir</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>&amp;Gravar</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>Gravar Como</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>Gravar &amp;Como</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
         <translation>Acerca de</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Aceitar</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>&amp;Aceitar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>Selecção de Células</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>&amp;Selecção de Células</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>Cortar Células</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>Cor&amp;tar</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>Copiar Células</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>&amp;Copiar</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>Colar Células</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>Co&amp;lar</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>Colar Conteúdo</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>Colar Cont&amp;eúdo</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>Limpar Células</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>&amp;Limpar</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>Inserir Células</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>C&amp;élulas</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>Inserir Linhas</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>&amp;Linhas</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>Inserir Colunas</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>&amp;Colunas</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>Adicionar Folha</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>&amp;Folhas</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>Células</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>&amp;Células</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>Altura da Linha</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>&amp;Altura</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>Ajustar Linha</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>&amp;Ajustar</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>Mostrar Coluna</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>Mo&amp;strar</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>Esconder Coluna</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>&amp;Esconder</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>Largura da Coluna</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>&amp;Largura</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>Ajustar Coluna</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>Mostrar Coluna</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>Esconder Coluna</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>Mudar Nome da Folha</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>&amp;Mudar Nome</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>Remover Folha</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>R&amp;emover</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>Ordenar Dados</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Ordenar</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>Procurar &amp;&amp; Substituir</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>&amp;Procurar &amp;&amp; Substituir</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>Igual A</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>&amp;Igual A</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>Adição</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>&amp;Adição</translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation>Subtração</translation>
+        <translation>Subtracção</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation>&amp;Subtração</translation>
+        <translation>&amp;Subtracção</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>Multiplicação</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>&amp;Multiplicação</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>Divisão</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>&amp;Divisão</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>Abrir ParêntisestempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>&amp;Abrir Parêntises</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>Fechar Parêntises</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>&amp;Fechar Parêntises</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>Vírgula</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>&amp;Vírgula</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Editar</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation>&amp;Inserir</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>&amp;Formatar</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>&amp;Dados</translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation>&amp;Linha</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation>Colu&amp;na</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>&amp;Folha</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>&amp;Função</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
         <translation>&amp;Omissão</translation>
     </message>
     <message>
         <source>Summation</source>
         <translation>Somatório</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
         <translation>&amp;Somatório</translation>
     </message>
     <message>
         <source>Absolute Value</source>
         <translation>Valor Absoluto</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
         <translation>&amp;Absoluto</translation>
     </message>
     <message>
         <source>Sine</source>
         <translation>Seno</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
         <translation>Se&amp;no</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation>Arc-Seno</translation>
+        <translation>Arco-Seno</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
         <translation>A&amp;rco-Seno</translation>
     </message>
     <message>
         <source>Cosine</source>
         <translation>Coseno</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
         <translation>&amp;Coseno</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation>Arc-Coseno</translation>
+        <translation>Arco-Coseno</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation>Arc-Cos&amp;eno</translation>
+        <translation>Arco-Cos&amp;eno</translation>
     </message>
     <message>
         <source>Tangent</source>
         <translation>Tangente</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation>&amp;Tangente</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation>Arc-Tangente</translation>
+        <translation>Arco-Tangente</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation>Arc-Tan&amp;gente</translation>
+        <translation>Arco-Tan&amp;gente</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation>Arc-Tangende das Cordenadas</translation>
+        <translation>Arco-Tangente das Coordenadas</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation>C&amp;oordenadas Arc-Tangente</translation>
+        <translation>C&amp;oordenadas Arco-Tangente</translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation>Exponencial</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation>&amp;Exponencial</translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation>Logaritmo</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation>&amp;Logaritmo</translation>
     </message>
     <message>
         <source>Power</source>
         <translation>Elevado</translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation>&amp;Elevado</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation>&amp;Matemático</translation>
     </message>
     <message>
         <source>Average</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>Medi&amp;a</translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation>Máximo</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation>Má&amp;ximo</translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation>Mínimo</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation>&amp;Mínimo</translation>
     </message>
     <message>
         <source>Count</source>
         <translation>Contador</translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation>&amp;Contador</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation>E&amp;statística</translation>
     </message>
     <message>
         <source>Functions</source>
         <translation>Funções</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>&amp;Número de linhas:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>&amp;Número de colunas:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>&amp;Número de folhas:</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>Folha</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>&amp;Altura de cada linha:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>&amp;Largura de cada coluna:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>&amp;Nome da Folha:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>Existe apenas uma folha!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Tem a certeza?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>&amp;Tipo</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>Mover células para &amp;cima</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>Mover células para a &amp;direita</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>&amp;Linha toda</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>&amp;Coluna toda</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation>Folha de Cálculo
-Software para o Opie
+        <translation>Folha de Cálculo 
+Software para o Opie 
 Vencedor do Beta QWDC (como Sheet/Qt)
 
-Desenvolvido por: Serdar Ozler
+Desenvolvido por: Serdar Ozler 
 Versão 1.0.2
 Data: 8 de Outubro de 2002
 
-Este software está licenciado sob a licença GPL. A sua distribuição é livre. Para obter uma versão mais recente ou o código fonte, visite o site web.
+Este software está licenciado sob a licença GPL. A sua distribuição é livre. Para obter uma versão mais recente ou o código fonte, visite o sítio web.
 
 http://qtopia.sitebest.com</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation>Erro de sintaxe!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation>Não encontrada a tecla de procura!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Ordenar</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>&amp;Opção</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>&amp;Ordenar por</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>&amp;Depois por</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>Depois &amp;por</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>&amp;Procura exacta</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation>&amp;Direção</translation>
+        <translation>&amp;Direcção</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>&amp;Cima para baixo (linhas)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>&amp;Esquerda para direita (colunas)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>Ordenar</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>&amp;Ascendente</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>&amp;Descendente</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation>Não é possivel ordenar apenas uma célula!</translation>
+        <translation>Não é possível ordenar apenas uma célula!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index 9d7fd8c..e12534f 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -1,158 +1,158 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation>Brilho</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
         <translation>Leitor Imagens</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
         <translation>Virar Horizontalmente</translation>
     </message>
     <message>
         <source>Vertical flip</source>
         <translation>Virar Verticalmente</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Rotate 180</source>
         <translation>Rodar 180º</translation>
     </message>
     <message>
         <source>Rotate 90</source>
         <translation>Rodar 90º</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Ecrâ Todo</translation>
     </message>
     <message>
         <source> - Image Viewer</source>
         <translation>- Leitor Imagens</translation>
     </message>
     <message>
         <source> True color</source>
-        <translation type="unfinished"></translation>
+        <translation>Cor Real</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Miniaturas</translation>
     </message>
     <message>
         <source>Preferences..</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferências..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação da Imagem...</translation>
     </message>
     <message>
         <source>Open ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
-        <translation type="unfinished">Rodar 270º</translation>
+        <translation>Rodar 270º</translation>
     </message>
     <message>
         <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Brilho...</translation>
     </message>
     <message>
         <source>Black And White</source>
-        <translation type="unfinished"></translation>
+        <translation>Preto e Branco</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Escalar ao tamanho do Ecrâ</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>%1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 cores</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 níveis</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation>canal alfa de 8 bits</translation>
     </message>
     <message>
         <source>Slide show</source>
-        <translation type="unfinished"></translation>
+        <translation>Apresentação</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>Parar Apresentação</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Preferências</translation>
     </message>
     <message>
         <source>Slide Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Apresentação</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Intervalo entre imagens</translation>
     </message>
     <message>
         <source>s</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>Repetir apresentação</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar do fim para o princípio</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar imagens rotadas 90º</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregamento rápido de imagens</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/snake.ts b/i18n/pt/snake.ts
index 0683b50..df6f01e 100644
--- a/i18n/pt/snake.ts
+++ b/i18n/pt/snake.ts
@@ -1,43 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Cobra</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>COBRA!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use o joypad para guiar a cobra 
 de forma a comer o rato. Tem de 
 evitar bater nas paredes ou na cauda.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Prima uma tecla para começar</translation>
+        <translation type="obsolete">Prima uma tecla para começar</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>Pontuação: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FIM DE JOGO!
 Pontuação: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Prima uma tecla para começar um novo jogo.</translation>
+        <translation type="obsolete">Prima uma tecla para começar um novo jogo.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>Prima uma tecla para começar</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation>Prima uma tecla para começar um jogo novo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sound.ts b/i18n/pt/sound.ts
index ddbf3d1..71f317e 100644
--- a/i18n/pt/sound.ts
+++ b/i18n/pt/sound.ts
@@ -1,128 +1,128 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SoundSettings</name>
     <message>
         <source>Shows icon</source>
         <translation>Mostrar ícone</translation>
     </message>
     <message>
         <source>Hides icon</source>
         <translation>Esconder ícone</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>Vmemo Settings</source>
         <translation>Configuração Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
         <translation>8000</translation>
     </message>
     <message>
         <source>11025</source>
         <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
         <translation>22050</translation>
     </message>
     <message>
         <source>33075</source>
         <translation>33075</translation>
     </message>
     <message>
         <source>44100</source>
         <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Estéreo</translation>
     </message>
     <message>
         <source>16 bit</source>
         <translation>16 bits</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
         <translation>Alertas Visuais</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
-        <translation>Icon na Barra de Tarefas</translation>
+        <translation>Ícone na Barra de Tarefas</translation>
     </message>
     <message>
         <source>Key_Space</source>
         <translation>Key_Space</translation>
     </message>
     <message>
         <source>Key_Home</source>
         <translation>Key_Home</translation>
     </message>
     <message>
         <source>Key_Calender</source>
         <translation>Key_Calendar</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Key_Contacts</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Key_Menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Key_Mail</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Frequência:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Directoria de Gravação:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla de Gravação:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
-        <translation>Tempo Limite de gravação (seg):</translation>
+        <translation>Tempo Limite de gravação (segs):</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ilimitada</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Reiniciar Opie se necessário</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Key_Record</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/stockticker.ts b/i18n/pt/stockticker.ts
new file mode 100644
index 0000000..511e850
--- a/dev/null
+++ b/i18n/pt/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>&amp;Abrir Ficheiro</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Fechar</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>Para &amp;Trás</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>Para a &amp;Frente</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>&amp;Início</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>Adicionar Favorito</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>&amp;Ficheiro</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>&amp;Ir</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>Histórico</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>Favoritos</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>Para Trás</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>Para a Frente</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>Início</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>Procura de Símbolo</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>Introduza algo para procurar.</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 4658f5b..e360a41 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -1,302 +1,282 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>Este gráfico representa o espaço ocupado neste cartão de memória Compact Flash.</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>Disco</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>Este gráfico representa o espaço ocupado neste disco.</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>Este gráfico representa o espaço ocupado neste cartão de memória Secure Digital.</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>Memória</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>Este gráfico representa o espaço ocupado na memória interna (p.ex. Flash Memory) neste dispositivo.</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>RAM</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>Este gráfico representa o espaço ocupado na memória RAM.</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este gráfico representa a ocupação do processador.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta página mostra quanta memória (i.e. RAM) está alocada no seu dispositivo.
+A memória está categorizada da seguinte forma:
+
+1. Usada - memória usada pelo Opie e pelas aplicações a correr.
+2. Buffers - memória temporária usada para melhorar a performance.
+3. Cached - memória temporária para manter a ultima informação usada 
+4. Free - memória não usada.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
-        <translation type="unfinished"></translation>
+        <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <source>Use#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
+        <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a lista de todos os módulos do kernel actualmente em utilização neste dispositivo.
+
+Clique e espere num módulo para ver informação adicional, ou para o remover da memória.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione um comando aqui e depois clique no botão &quot;Enviar&quot; para enviar o comando ao módulo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished">Enviar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para enviar o comando seleccionado ao módulo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta àrea mostra a informação detalhada deste módulo.</translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
-        <translation type="unfinished"></translation>
+        <source>Used by</source>
+        <translation>Usado por</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation>Deseja mesmo executar %1 para este módulo?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a lista de todos os processos deste dispositivo.
+
+Clique e espere num processo para ver informação adicional, ou para lhe enviar um sinal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Seleccione um sinal aqui e depois clique no botão &quot;Enviar&quot; para enviar o sinal ao processo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished">Enviar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para enviar o sinal seleccionado ao processo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta àrea mostra a informação detalhada deste processo.</translation>
     </message>
     <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation>Deseja mesmo enviar %1 para este processo?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info. Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
-        <translation type="unfinished"></translation>
+        <translation>Módulos</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel de Linux&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilado em:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Modelo:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Marca:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta página mostra a versão do Opie, do kernel do Linux e da distribuição a correr neste dispositivo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/systemtime.ts b/i18n/pt/systemtime.ts
index c42ee76..3642dd9 100644
--- a/i18n/pt/systemtime.ts
+++ b/i18n/pt/systemtime.ts
@@ -1,324 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished">Formato da Hora</translation>
+        <translation>Formato da Hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished">hh:mm</translation>
+        <translation>hh:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M hh:mm</translation>
+        <translation>D/M hh:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished">M/D hh:mm</translation>
+        <translation>M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished">12/24 Horas</translation>
+        <translation>12/24 Horas</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished">24 Horas</translation>
+        <translation>24 Horas</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished">12 Horas</translation>
+        <translation>12 Horas</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished">Formato da data</translation>
+        <translation>Formato da data</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished">Semana começa em</translation>
+        <translation>Semana começa em</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished">Domingo</translation>
+        <translation>Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished">Segunda</translation>
+        <translation>Segunda</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora do Sistema</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formato</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Prever</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Continuar?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>A executar:
+ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao obter a hora a partir da rede.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao executar o ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor de Tempo</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao obter a hora do 
+servidor:</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <source>Could not connect to server </source>
+        <translation>Não foi possível ligar ao servidor</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>Pediu um tempo de espera de %1 minutos, mas só passaram %2 deste a última actualização.&lt;br&gt;Continuar?</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
+        <translation>%1 segundos</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora de Início</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Time shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Diferença de tempo</translation>
     </message>
     <message>
         <source>New time</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova hora</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter hora a partir da rede</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Deslize de tempo previsto</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Diferença Estimada</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora Prevista</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Diferença [s/h]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Último [h]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
+        <translation>Diferênca [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora prevista</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar Hora Prevista</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <translation>s/h</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Fuso Horário</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Formato da Hora</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 Horas</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 Horas</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Semana começa em</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Segunda</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato da data</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Formato da Hora</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
+        <translation>segundos</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Servidor de tempo</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutos entre actualizações da hora</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minutos entre actualizações da previsão</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar informação do servidor de hora</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar informação da previsão da hora</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished">Hora</translation>
+        <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">Minuto</translation>
+        <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished">AM</translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished">PM</translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Fuso Horário</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Obter hora a partir da rede</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Mudar a hora prevista</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/tableviewer.ts b/i18n/pt/tableviewer.ts
index 7d41b6f..da22d3d 100644
--- a/i18n/pt/tableviewer.ts
+++ b/i18n/pt/tableviewer.ts
@@ -1,69 +1,69 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível atribuir o valor por omissão para o tipo %1. A chave não foi adicionada.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi encontrado nenhum tipo válido para o comando DataElem::setField(%1, %2)</translation>
     </message>
 </context>
 <context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar</translation>
     </message>
     <message>
         <source>key</source>
-        <translation type="unfinished"></translation>
+        <translation>chave</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Chaves</translation>
     </message>
     <message>
         <source>Key Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome da Chave</translation>
     </message>
     <message>
         <source>Key Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de Chave</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Clear All</source>
-        <translation type="unfinished"></translation>
+        <translation>Limpar Tudo</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista em Lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Bases de Dados</translation>
     </message>
     <message>
         <source>could not load Document</source>
-        <translation type="unfinished"></translation>
+        <translation>não foi possível aceder ao ficheiro</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/tabmanager.ts b/i18n/pt/tabmanager.ts
index 5220644..ab1c9cc 100644
--- a/i18n/pt/tabmanager.ts
+++ b/i18n/pt/tabmanager.ts
@@ -1,87 +1,88 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppEdit</name>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Icon:</source>
         <translation>Ícone:</translation>
     </message>
     <message>
         <source>Exec:</source>
         <translation>Exec:</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Comentário:</translation>
     </message>
 </context>
 <context>
     <name>TabManager</name>
     <message>
         <source>Message</source>
         <translation>Mensagem</translation>
     </message>
     <message>
         <source>Can&apos;t remove with applications
 still in the group.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não é possível apagar o grupo 
+pois ainda contêm aplicações.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Are you sure you want to delete?</source>
-        <translation type="unfinished">Tem a certeza que </translation>
+        <translation>Tem a certeza que quer apagar?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível apagar.</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Pasta</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
+        <translation>A ler os ícones...</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplicação</translation>
     </message>
 </context>
 <context>
     <name>TabManagerBase</name>
     <message>
         <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestor de Pastas</translation>
     </message>
     <message>
         <source>Hierarchy</source>
         <translation>Hierarquia</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Espere um Momento...</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/tetrix.ts b/i18n/pt/tetrix.ts
index e2aa69d..9bb16f5 100644
--- a/i18n/pt/tetrix.ts
+++ b/i18n/pt/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>vazio</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>Introduza o seu nome!</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>Top de Pontuações</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>#</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>Pontos</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>Nível</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetris</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Próximo</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Pontuação</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Nível</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Removido</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/textedit.ts b/i18n/pt/textedit.ts
index 999cdce..08e44c0 100644
--- a/i18n/pt/textedit.ts
+++ b/i18n/pt/textedit.ts
@@ -1,264 +1,271 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar</translation>
     </message>
     <message>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Como</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Cortar</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Copiar</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Colar</translation>
     </message>
     <message>
         <source>Find...</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar...</translation>
     </message>
     <message>
         <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Aumentar Tamanho</translation>
     </message>
     <message>
         <source>Zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>Reduzir Tamanho</translation>
     </message>
     <message>
         <source>Wrap lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Quebrar linhas</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonte</translation>
     </message>
     <message>
         <source>Start with new file</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar com um ficheiro novo</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver</translation>
     </message>
     <message>
         <source>Find Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Procurar Próximo</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar Procurar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>.desktop File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Documento Real</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tudo</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Texto</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Insira Hora e Data</translation>
     </message>
     <message>
         <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
+        <translation>Funcionalidades Avançadas</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Avisar ao Sair</translation>
     </message>
     <message>
         <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir sempre o ficheiro real</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Permissões do Ficheiro</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de Procura Aberta</translation>
     </message>
     <message>
         <source>Goto Line...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir para Linha...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gravar Automaticamente a cada 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Foi detectado um ficheiro &lt;b&gt;.desktop&lt;/b&gt;. Deseja abrir este ficheiro ou o ficheiro real para onde ele aponta?</translation>
     </message>
     <message>
         <source>Text Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Texto</translation>
     </message>
     <message>
         <source>Write Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Falhou a Escrita do Ficheiro</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <translation>SemNome</translation>
     </message>
     <message>
         <source>Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Permissões</translation>
     </message>
     <message>
         <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha fonte</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Texto - Copyright 2000 Trolltech AS e 2002 L. J. Potter (llornkcor@handhelds.org) e licenciado sob a licença GPL</translation>
     </message>
     <message>
         <source>Textedit</source>
-        <translation type="unfinished"></translation>
+        <translation>EditorTexto</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Foram detectadas
+alterações. Deseja
+gravá-las ?</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Não Gravar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Not enough lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem linhas suficientes</translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Editor de Texto</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>Tem a certeza que quer apagar o ficheiro do disco ?
+Esta operação é &lt;b&gt;irreversível!&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar permissões do Ficheiro</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterar permissões para:</translation>
     </message>
     <message>
         <source>owner</source>
-        <translation type="unfinished"></translation>
+        <translation>utilizador</translation>
     </message>
     <message>
         <source>group</source>
-        <translation type="unfinished"></translation>
+        <translation>grupo</translation>
     </message>
     <message>
         <source>others</source>
-        <translation type="unfinished"></translation>
+        <translation>outros</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Utilizador</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Grupo</translation>
     </message>
     <message>
         <source>read</source>
-        <translation type="unfinished"></translation>
+        <translation>leitura</translation>
     </message>
     <message>
         <source>write</source>
-        <translation type="unfinished"></translation>
+        <translation>escrita</translation>
     </message>
     <message>
         <source>execute</source>
-        <translation type="unfinished"></translation>
+        <translation>execução</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Atenção</translation>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro - sem utilizador</translation>
     </message>
     <message>
         <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro - sem grupo</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao alterar o utilizador ou o grupo</translation>
     </message>
     <message>
         <source>Error setting mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao alterar as permissões</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Permissões do Ficheiro</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/tictac.ts b/i18n/pt/tictac.ts
index 90c6431..d1fcdf4 100644
--- a/i18n/pt/tictac.ts
+++ b/i18n/pt/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>Jogo do Galo</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computador começa</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Humano começa</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Jogar!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Click Jogar para começar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Sua vez de jogar</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Ganhou!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Perdeu!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/tinykate.ts b/i18n/pt/tinykate.ts
new file mode 100644
index 0000000..6343d5a
--- a/dev/null
+++ b/i18n/pt/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>TinyKATE</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Novo</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gravar</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>Gravar Como</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>Ficheiro</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>Fonte Maior</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>Fonte Menor</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>Ver</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>Utilitários</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>Destacar</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configurações</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>Sem Nome %1</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index c9f4a0d..8c85b8b 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,117 +1,190 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
         <source>No plugins found</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foram encontrados extras</translation>
     </message>
     <message>
         <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
+        <translation>Não existe nenhum extra activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para lançar a aplicação associada</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
+        <translation type="obsolete">&lt;b&gt;Propriedade de %1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
-        <translation type="unfinished"></translation>
+        <translation>Hoje, por Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para a janela de configuração</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished">Configuração</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
+        <translation>Quais os extras a carregar e qual a ordem:</translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover para Cima</translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover para Baixo</translation>
     </message>
     <message>
         <source>active/order</source>
-        <translation type="unfinished"></translation>
+        <translation>activar/ordenar</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">iniciar automaticamente
+quando ligar?
+(apenas Opie)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">minutos inactivo</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Active aqui se quiser que o &quot;hoje&quot; seja iniciado ao ligar o dispositivo.</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Qual o intervalo de inactividade, em minutos, para que, ao ligar, o&quot;hoje&quot; seja iniciado </translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Tamanho do icone</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Altere o tamanho do icone, em pixeis</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Reler</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Qual o intervalo de actualização</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">seg</translation>
     </message>
     <message>
         <source>never</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">nunca</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
+        <translation>Active ou desactive cada extra ou use os cursores para alterar a ordem</translation>
+    </message>
+    <message>
+        <source>Today Config</source>
+        <translation>Configuração do &quot;Hoje&quot;</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">Barra Pequena</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation>Form1</translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation>Active aqui se quiser que o &quot;hoje&quot; seja iniciado ao ligar o dispositivo.</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation>iniciar ao ligar?</translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation>barra pequena</translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation>Com barra pequena</translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation>Qual o intervalo de inactividade, em minutos, para que o&quot;hoje&quot; seja iniciado ao ligar</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation>minutos inactivo</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation>píxel</translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation>Altere o tamanho do icone, em pixeis</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation>tamanho do icone</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation>seg</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation>nunca</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation>Qual o intervalo de actualização</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation>actualizar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index 8c1510a..225fca8 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -1,555 +1,617 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
+        <source>Ok</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation>&lt;h1&gt;Alarme em %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation type="unfinished"></translation>
+        <source>Alarms</source>
+        <translation>Alarmes</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>Recorrência</translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>Editor de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <translation>Editar Tarefa</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation>silêncio</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>alto</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>Lista de Tarefas do Opie</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo a partir de exemplo</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">Nova Tarefa</translation>
+        <translation>Nova Tarefa</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para criar uma nova tarefa.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para modificar uma tarefa.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation type="unfinished">Ver Tarefa</translation>
+        <translation>Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished">Apagar...</translation>
+        <translation>Apagar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para remover a tarefa actual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation type="unfinished">Apagar Todas...</translation>
+        <translation>Apagar Todas...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Remoção completa</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">Irradiar</translation>
+        <translation>Irradiar</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para irradiar a tarefa actual para outro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Procurar</translation>
+        <translation>Procurar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar tarefas completas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar apenas tarefas atrazadas</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar data limite das tarefas</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar barra de tarefas rápidas</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished">Dados</translation>
+        <translation>Dados</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Categoria</translation>
+        <translation>Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished">Opções</translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é a lista de todas as tarefas actuais.
+
+Esta lista mostra a seguinte informação:
+1. Completadas - o visto verde indica que a tarefa está completa. Clique aqui para completar a tarefa.
+2. Prioridade - uma representação gráfica da prioridade da tarefa. Faça duplo clique para a modificar.
+3. Descrição - descrição da tarefa. Clique aqui para a seleccionar.
+4. Data Limite - mostra a data limite para a execução da tarefa. Esta coluna pode ser visível ou não a partir do menu &quot;Opções-&gt;Mostrar data limite das tarefas&quot;.</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished">Todas as Categoria</translation>
+        <translation>Todas as Categorias</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation type="unfinished">Sem espaço</translation>
+        <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Não foi possível gravar 
+as alterações
+Liberte algum espaço 
+e tente novamente.
+
+Sair na mesma?</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation type="unfinished">Tarefa</translation>
+        <translation>Tarefa</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">Não pode editar enquanto sincroniza</translation>
+        <translation type="obsolete">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>todas as tarefas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>todas as tarefas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">Vazio</translation>
+        <translation>Vazio</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Recebidas %1 nova(s) tarefas.&lt;p&gt;Quer adicioná-las a lista?</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Novas Tarefas</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished">Duplicar</translation>
+        <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
-        <translation type="unfinished">C.</translation>
+        <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
-        <translation type="unfinished"></translation>
+        <translation>Prioridade</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation>Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation type="unfinished">Limite</translation>
+        <translation>Data Limite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar Exemplos</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prioridade:</translation>
+    </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>Editor de Exemplos</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>Editar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>Novo Exemplo %1</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Clique aqui para mudar a prioridade da tarefa.
+
+Esta àrea é chamada de barra de tarefas rápidas.
+
+Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Introduza a descrição da nova tarefa aqui.
+
+Esta àrea é chamada de barra de tarefas rápidas.
+
+Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.
+</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>Mais</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Clique aqui para adicionar informação à tarefa.
+
+Esta àrea é chamada de barra de tarefas rápidas.
+
+Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>Introduza</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Clique aqui adicionar uma tarefa.
+
+Esta àrea é chamada de barra de tarefas rápidas.
+
+Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>Clique aqui para limpar a informação da tarefa.
+
+Esta àrea é chamada de barra de tarefas rápidas.
+
+Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista de Tabela</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>Data</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>Hora</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza uma descrição curta da tarefa aqui.</translation>
     </message>
     <message>
         <source>Complete </source>
-        <translation type="unfinished"></translation>
+        <translation>Completa</translation>
     </message>
     <message>
         <source>Work on </source>
-        <translation type="unfinished"></translation>
+        <translation>Trabalhar em</translation>
     </message>
     <message>
         <source>Buy </source>
-        <translation type="unfinished"></translation>
+        <translation>Comprar</translation>
     </message>
     <message>
         <source>Organize </source>
-        <translation type="unfinished"></translation>
+        <translation>Organizar</translation>
     </message>
     <message>
         <source>Get </source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Update </source>
-        <translation type="unfinished"></translation>
+        <translation>Actualizar</translation>
     </message>
     <message>
         <source>Create </source>
-        <translation type="unfinished"></translation>
+        <translation>Criar</translation>
     </message>
     <message>
         <source>Plan </source>
-        <translation type="unfinished"></translation>
+        <translation>Plano</translation>
     </message>
     <message>
         <source>Call </source>
-        <translation type="unfinished"></translation>
+        <translation>Chamada</translation>
     </message>
     <message>
         <source>Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>EMail</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha a prioridade da tarefa aqui.</translation>
     </message>
     <message>
         <source>Very High</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Alta</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Baixa</translation>
     </message>
     <message>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Baixa</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha a categoria da tarefa aqui.</translation>
     </message>
     <message>
         <source>Recurring task</source>
-        <translation type="unfinished"></translation>
+        <translation>Tarefa recorrente</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui se a tarefa é recursiva. A frequência pode ser configurada na opção de &quot;Recorrência&quot;.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Introduza informação adicional da tarefa aqui.</translation>
     </message>
     <message>
         <source>Todo List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de Tarefas</translation>
+    </message>
+    <message>
+        <source>Summary:</source>
+        <translation>Sumário:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar o estado desta tarefa.</translation>
     </message>
     <message>
         <source>Started</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiada</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminada</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation type="unfinished"></translation>
+        <translation>Por Iniciar</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Progresso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha o progresso desta tarefa.</translation>
     </message>
     <message>
         <source>0 %</source>
-        <translation type="unfinished"></translation>
+        <translation>0%</translation>
     </message>
     <message>
         <source>20 %</source>
-        <translation type="unfinished"></translation>
+        <translation>20%</translation>
     </message>
     <message>
         <source>40 %</source>
-        <translation type="unfinished"></translation>
+        <translation>40%</translation>
     </message>
     <message>
         <source>60 %</source>
-        <translation type="unfinished"></translation>
+        <translation>60%</translation>
     </message>
     <message>
         <source>80 %</source>
-        <translation type="unfinished"></translation>
+        <translation>80%</translation>
     </message>
     <message>
         <source>100 %</source>
-        <translation type="unfinished"></translation>
+        <translation>100%</translation>
     </message>
     <message>
         <source>Start Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data Início:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para alterar a data de início desta tarefa.</translation>
     </message>
     <message>
         <source>Due Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data Limite:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para alterar a data limite desta tarefa.</translation>
     </message>
     <message>
         <source>Completed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para marcar esta tarefa como completa.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para introduzir a data em que esta tarefa foi completa.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de Manutenção:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar a regra de manutenção.</translation>
     </message>
     <message>
         <source>Nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation type="unfinished"></translation>
+        <translation>Responsável</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation type="unfinished"></translation>
+        <translation>Feito Por</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation type="unfinished"></translation>
+        <translation>Coordenação</translation>
     </message>
     <message>
         <source>Maintainer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este é o nome do mantenedor da tarefa actual.</translation>
     </message>
     <message>
         <source>test</source>
-        <translation type="unfinished"></translation>
+        <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar o mantenedor da tarefa.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/ubrowser.ts b/i18n/pt/ubrowser.ts
new file mode 100644
index 0000000..f9f0e63
--- a/dev/null
+++ b/i18n/pt/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>uBrowser</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>- uBrowser</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>%1 - uBrowser</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>Erro!</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>O Endereço IP não foi encontrado</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>Erro ao criar a ligação</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>Erro na ligação</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/usermanager.ts b/i18n/pt/usermanager.ts
index 383094b..6bd4f13 100644
--- a/i18n/pt/usermanager.ts
+++ b/i18n/pt/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>Adicionar Grupo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Editar Grupo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>Gestor de Users do OPIE</translation>
+        <translation type="obsolete">Gestor de Users do OPIE</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation>Gestor de Utilizadores do Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Adicionar User</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>Editar User</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/wellenreiter.ts b/i18n/pt/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/pt/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/pt/wordgame.ts b/i18n/pt/wordgame.ts
index 2e68736..24c9d21 100644
--- a/i18n/pt/wordgame.ts
+++ b/i18n/pt/wordgame.ts
@@ -1,133 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Board</name>
     <message>
         <source>Blanks: </source>
         <translation>Vazios:</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Unknown word</source>
         <translation>Palavra desconhecida</translation>
     </message>
     <message>
         <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
-        <translation>&lt;p&gt;A palavra &quot;%1&quot; não existe no dicionário.</translation>
+        <translation>&lt;p&gt;A palavra &quot;%1&quot; não está no dicionário.</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
 </context>
 <context>
     <name>NewGameBase</name>
     <message>
         <source>Players</source>
         <translation>Jogadores</translation>
     </message>
     <message>
         <source>AI3: Smart AI player</source>
-        <translation>Computador</translation>
+        <translation>IA3: computador</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>Regras</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Começar</translation>
     </message>
 </context>
 <context>
     <name>RulesBase</name>
     <message>
         <source>Game Rules</source>
         <translation>Regras do Jogo</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Board</source>
-        <translation>Mesa</translation>
+        <translation>Tabuleiro</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamanho:</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
 </context>
 <context>
     <name>ScoreInfo</name>
     <message>
         <source>&lt;P&gt;Invalid move</source>
         <translation>&lt;p&gt;Jogada inválida</translation>
     </message>
     <message>
         <source>&lt;P&gt;Score: </source>
         <translation>&lt;p&gt;Pontuação:</translation>
     </message>
 </context>
 <context>
     <name>WordGame</name>
     <message>
         <source>Word Game</source>
-        <translation>Palavras Cruzadas</translation>
+        <translation>Jogo das Palavras</translation>
     </message>
     <message>
         <source>Back</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Concluído</translation>
+        <translation>Feito</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
     <message>
         <source>End game</source>
         <translation>Terminar Jogo</translation>
     </message>
     <message>
         <source>Do you want to end the game early?</source>
-        <translation>Terminar o jogo?</translation>
+        <translation>Tem a certeza que quer terminar o jogo?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Não</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/.directory b/i18n/pt_BR/.directory
index cdd6eba..4fc2d83 100644
--- a/i18n/pt_BR/.directory
+++ b/i18n/pt_BR/.directory
@@ -1,8 +1,10 @@
 [Desktop Entry]
 Name=Brasilian
 Name[da]=Brasiliansk
 Name[es]=Brasileño
 Name[it]=Brasiliano
 Name[pt]=Brasileiro
 Name[pt_BR]=Brasileiro
 Name[sl]=Brazilščina
+Name[de]=Brasiliansch
+Name[nl]=Braziliaans
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 7472bb3..2e37210 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1,918 +1,917 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Out of Space</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Enviar Registro</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">P/ Baixo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished">Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished">Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished">Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished">Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatos</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index ee084a6..ed7af0f 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -1,304 +1,348 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to Remote</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>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Copy Same Dir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>to
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
+It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>write</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/appskey.ts b/i18n/pt_BR/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/pt_BR/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/aqpkg.ts b/i18n/pt_BR/aqpkg.ts
index 348cc10..6db6ebe 100644
--- a/i18n/pt_BR/aqpkg.ts
+++ b/i18n/pt_BR/aqpkg.ts
@@ -1,546 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/backgammon.ts b/i18n/pt_BR/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/pt_BR/backgammon.ts
+++ b/i18n/pt_BR/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/backup.ts b/i18n/pt_BR/backup.ts
index 02b6cc2..e90fc17 100644
--- a/i18n/pt_BR/backup.ts
+++ b/i18n/pt_BR/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/bounce.ts b/i18n/pt_BR/bounce.ts
index 9d2d3d1..4a3035b 100644
--- a/i18n/pt_BR/bounce.ts
+++ b/i18n/pt_BR/bounce.ts
@@ -1,100 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/calibrate.ts b/i18n/pt_BR/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/pt_BR/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index 77b4422..b726534 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/clock.ts b/i18n/pt_BR/clock.ts
index f6ae122..438cea3 100644
--- a/i18n/pt_BR/clock.ts
+++ b/i18n/pt_BR/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Relógio</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Zerar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Cronômetro</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 09f751b..535620c 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -1,811 +1,803 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendário nao pode salvar
 suas modificações.
 Libere algum espaço e tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erro!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Conserte</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconhecido)</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>A duração do evento é potencialmente mais
 longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edit Event</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>ListaSem</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>F</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished">Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished">Q</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>This is an all day event.</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>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished">Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished">Alarme Padrão</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished">Horário de início dos eventos</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"> minutos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished">Horário de Inicio:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished">Preferências</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished">Configuração do Alarme</translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished">:00</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished">Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation>S</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation>T</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation>Q</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation>Q</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation>S</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation>S</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation>D</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>No Repeat...</source>
         <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>Home</source>
         <translation type="unfinished">Casa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished">Alto</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished">Almoço</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished">&amp;Alarme</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished">Reunião</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished">Sem Repetição...</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"> minutos</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished">Jantar</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Escritório</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished">Repetir</translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished">Local</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished">Silencioso</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viagem</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished">O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 todo(a) </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todo(a) </translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>O(A) %1 a cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>O(A) %1 %1 a cada</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>nd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>st</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>th</source>
         <translation>o(a)</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fim Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/drawpad.ts b/i18n/pt_BR/drawpad.ts
index 0e3ea96..86e7861 100644
--- a/i18n/pt_BR/drawpad.ts
+++ b/i18n/pt_BR/drawpad.ts
@@ -1,435 +1,443 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Redo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Width:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Height:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/euroconv.ts b/i18n/pt_BR/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/pt_BR/euroconv.ts
+++ b/i18n/pt_BR/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/filebrowser.ts b/i18n/pt_BR/filebrowser.ts
deleted file mode 100644
index 3510789..0000000
--- a/i18n/pt_BR/filebrowser.ts
+++ b/dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Diretório</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Ordem</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Colar</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Diretório anterior</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nova Pasta</translation>
-    </message>
-    <message>
-        <source>File Manager</source>
-        <translation>Gerenciador de Arquivos</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Ascendente</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>por Data</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>por Nome</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>por Tamanho</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>por Tipo</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Diretório pai</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>No</source>
-        <translation>Não</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Cortar</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Executar</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sim</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Renomear falhou !</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Apagar falhou !</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Colar</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Lançar Aplicação</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Renomear arquivo</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Mudar Permissões</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Mudar Permissões</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Apagar</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Lançamento falhou !</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>Impossível exibir diretório /dev/ .</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Renomear</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nova Pasta</translation>
-    </message>
-    <message>
-        <source>File Manager</source>
-        <translation>Gerenciador de Arquivos</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Criação de pasta falhou !</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Colar arquivo</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Colar falhou !</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Selecionar tudo</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Cortar falhou !</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Cortar arquivo</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Adicionar aos Documentos</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Ver como texto</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Desmarcar todos</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Tem certeza ?</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>read</source>
-        <translation>ler</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Grupo</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Dono</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>grupo</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>dono</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>escrever</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>outros</translation>
-    </message>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Ajustar Permissões de Arquivo</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>executar</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Ajustar permissões para:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/formatter.ts b/i18n/pt_BR/formatter.ts
index 751e732..b1fd5b4 100644
--- a/i18n/pt_BR/formatter.ts
+++ b/i18n/pt_BR/formatter.ts
@@ -1,161 +1,167 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
+        <source>Card mount failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Card mount failed!</source>
+        <source>You can now close the output window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
+        <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You can now close the output window.</source>
+        <source>Total: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Internal</source>
+        <source>Used: %1 kB ( %d mB)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Storage Type : </source>
+        <source>Available: %1 kB ( %d mB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
+        <source>Format?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Available: %1 kB ( %d mB)</source>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/helpbrowser.ts b/i18n/pt_BR/helpbrowser.ts
index 79783f0..a1541ef 100644
--- a/i18n/pt_BR/helpbrowser.ts
+++ b/i18n/pt_BR/helpbrowser.ts
@@ -1,38 +1,38 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Add Bookmark</source>
         <translation>Adicionar Marcador</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Marcadores</translation>
     </message>
     <message>
         <source>Backward</source>
         <translation>Voltar</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Remover dos Marcadores</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation>NavegadorDeAjuda</translation>
-    </message>
-    <message>
         <source>Forward</source>
         <translation>Avançar</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Navegador de Ajuda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/kpacman.ts b/i18n/pt_BR/kpacman.ts
index fb73268..7546bd0 100644
--- a/i18n/pt_BR/kpacman.ts
+++ b/i18n/pt_BR/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>READY!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/launchersettings.ts b/i18n/pt_BR/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/pt_BR/launchersettings.ts
+++ b/i18n/pt_BR/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libfreetypefactory.ts b/i18n/pt_BR/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt/libfreetypefactory.ts
+++ b/i18n/pt_BR/lib.ts
diff --git a/i18n/pt_BR/libbatteryapplet-ipaq.ts b/i18n/pt_BR/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/pt_BR/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/libclockapplet.ts b/i18n/pt_BR/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/pt_BR/libclockapplet.ts
+++ b/i18n/pt_BR/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libdialup.ts b/i18n/pt_BR/libdialup.ts
deleted file mode 100644
index df00f6c..0000000
--- a/i18n/pt_BR/libdialup.ts
+++ b/dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished">seg</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished">Auto-detectar servidores de nome</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished">Tempo limite de ociosidade</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished">Rede</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished">Telefone:</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished">Velocidade:</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished">DNS Secundário</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished">Tempo de espera:</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished">Discagem por demanda</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished">Proxy</translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished">Conta</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished">Controle de fluxo por hardware</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished">Controle de fluxo</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished">DNS Primário</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"> segundos</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished">Senha:</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished">Conexão manual, desconexão automática</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished">Conexão e desconexão automáticas</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished">Nome de Usuário:</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished">Auto detectar rota</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished">Gateway</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished">Conexão e desconexão manuais</translation>
-    </message>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished">Conexão Discada</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished">Esperando por atividade</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished">Iniciando o modem</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished">Conectando</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished">Autenticando</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished">Sem tom de discagem</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished">Sem Portadora</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished">Número ocupado</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished">Tempo esgotado</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished">Conexão falhou</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished">Autenticação Falhou</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished">Conectado</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/libflatstyle.ts b/i18n/pt_BR/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/pt_BR/libflatstyle.ts
+++ b/i18n/pt_BR/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libinterfaces.ts b/i18n/pt_BR/libinterfaces.ts
index 407ea1f..8239ed9 100644
--- a/i18n/pt_BR/libinterfaces.ts
+++ b/i18n/pt_BR/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libkeyview.ts b/i18n/pt_BR/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/pt_BR/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/libkppp.ts b/i18n/pt_BR/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/pt_BR/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/liblan.ts b/i18n/pt_BR/liblan.ts
deleted file mode 100644
index 937792d..0000000
--- a/i18n/pt_BR/liblan.ts
+++ b/dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation>Configuração de Rede</translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation>Este nome já existe.
- Por favor escolha um
- diferente.</translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished">DNS</translation>
-    </message>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished">Rede </translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished">Broadcast</translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished">Obter Informações TCP/IP Automaticamente</translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished">TCP/IP</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished">DNS Secundário</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished">Proxy</translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished">Conta</translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished">Endereço IP</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished">DNS Primário</translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished">Especificar Informações de TCP/IP</translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished">Máscara de Rede</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished">Gateway</translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished">Endereço IP:</translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished">Serviço:</translation>
-    </message>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt/libmpeg3plugin.ts b/i18n/pt_BR/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt/libmpeg3plugin.ts
+++ b/i18n/pt_BR/libmodplugin.ts
diff --git a/i18n/pt_BR/libnetmonapplet.ts b/i18n/pt_BR/libnetmonapplet.ts
deleted file mode 100644
index f82b40c..0000000
--- a/i18n/pt_BR/libnetmonapplet.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished">Rede Desconectada</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished">Desconectado</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished">Conectado</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
-    </message>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished">Senha de Rede</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished">Conectado</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished">Entre a senha para %1</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index b78f90c..24385f3 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -1,108 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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="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"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on </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>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libopieobex.ts b/i18n/pt_BR/libopieobex.ts
index 5fda095..8fd774c 100644
--- a/i18n/pt_BR/libopieobex.ts
+++ b/i18n/pt_BR/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 097a332..08118d7 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -1,898 +1,956 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (mult.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Negócios</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Pessoal</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (Mult.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova Categoria</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova Categoria </translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Add</source>
         <translation type="unfinished">Adicionar</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation type="unfinished">Categorias Vão Aqui</translation>
     </message>
     <message>
         <source>Category Edit</source>
         <translation type="unfinished">Editar Categoria</translation>
     </message>
     <message>
         <source>Global</source>
         <translation type="unfinished">Global</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="unfinished">Categorias</translation>
     </message>
     <message>
         <source>Application</source>
         <translation type="unfinished">Aplicação</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Desculpe, outra aplicação está 
 editando as categorias.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Editar Categorias</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Fechar Seletor de Arquivo</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Seqüência não encontrada.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Fim atingido, reiniciando a partir do início</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation type="unfinished">Localizar</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation type="unfinished">Começar procura em:</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation type="unfinished">Procurar p/ trás</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation type="unfinished">Localizar:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Categoria:</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation type="unfinished">Sensível a caixa</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>File deletion failed.</source>
         <translation>Remoção de arquivo falhou.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Cópia de </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicata</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Cópia de arquivos falhou.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Falhou ao mover Documento.</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished">Disco Rígido</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished">Copia</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished">Nome:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished">Tipo:</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation type="unfinished">Carregamento rápido (consome memória)</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation type="unfinished">Comentário:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished">Localização</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished">Detalhes</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informações sobre o Proprietário</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished">Entre a senha</translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Y</source>
         <translation>S</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Tem certeza que deseja apagar
+        <translation type="obsolete">Tem certeza que deseja apagar
  %1 ?</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossível criar arquivos de inicialização
 Por favor, libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossível agendar alarme.
 Libere algum espaço e tente novamente.</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Houve um problema criando
 Informações de Configuração 
 para este programa.
 
 Por favor, libere algum espaço e
 tente novamente.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Com.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Endereço Res.:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Endereços de E-mail: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Fone Res.: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Resid.: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Celular Pess.: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pág. Web Pessoal: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pág. Web Comercial: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Fone Comercial: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profissão: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistente: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Gerente: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Masc</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Fem</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Sexo: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Esposo(a): </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Aniversário: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Aniv. de Casamento: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Apelido: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Título Prof</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Companhia</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Fone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Fone Res</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Fax Resid</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Celular Pess</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Cidade Comercial</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>UF Comercial</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>CEP Comercial</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>País Comercial</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Pág. Web Comercial</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Gerente</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Endereço Res</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Cidade Res</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>UF Res</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>CEP Res</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>país Res</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Pág. Web Pessoal</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Esposo(a)</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Aniversário</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Aniv. de Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Crianças</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished">Seg</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished">Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished">Qua</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished">Qui</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished">Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished">Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Dom</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Impossível agendar alarme.
 Por Favor libere algum espaço e tente novamente</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libsdmonapplet.ts b/i18n/pt_BR/libsdmonapplet.ts
deleted file mode 100644
index 536e419..0000000
--- a/i18n/pt_BR/libsdmonapplet.ts
+++ b/dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>&amp;OK</source>
-        <translation>&amp;OK</translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation>Monitor SD</translation>
-    </message>
-    <message>
-        <source>Eject card</source>
-        <translation>Desconectar cartão</translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation>Falhou ao desconectar o cartão</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/libtodayaddressbookplugin.ts b/i18n/pt_BR/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/pt_BR/libtodayaddressbookplugin.ts
+++ b/i18n/pt_BR/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libtodaydatebookplugin.ts b/i18n/pt_BR/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/pt_BR/libtodaydatebookplugin.ts
+++ b/i18n/pt_BR/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libtodaytodolistplugin.ts b/i18n/pt_BR/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/pt_BR/libtodaytodolistplugin.ts
+++ b/i18n/pt_BR/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/pt/librestartapplet.ts b/i18n/pt_BR/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt/librestartapplet.ts
+++ b/i18n/pt_BR/libtremorplugin.ts
diff --git a/i18n/pt_BR/libwlan.ts b/i18n/pt_BR/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/pt_BR/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libwlanplugin.ts b/i18n/pt_BR/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/pt_BR/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/liquid-settings.ts b/i18n/pt_BR/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/pt_BR/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/mailit.ts b/i18n/pt_BR/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/pt_BR/mailit.ts
+++ b/i18n/pt_BR/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mediummount.ts b/i18n/pt_BR/mediummount.ts
index 896ec3d..8f647e3 100644
--- a/i18n/pt_BR/mediummount.ts
+++ b/i18n/pt_BR/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mobilemsg.ts b/i18n/pt_BR/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/pt_BR/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/mpegplayer.ts b/i18n/pt_BR/mpegplayer.ts
deleted file mode 100644
index 1c01709..0000000
--- a/i18n/pt_BR/mpegplayer.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePlayer</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation>Desculpe, um erro ocorreu tentando reproduzir o arquivo: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation> Arquivo: </translation>
-    </message>
-    <message>
-        <source>No file</source>
-        <translation>Nenhum arquivo</translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation>O seguinte arquivo não foi encontrado: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation> Nenhum arquivo selecionado</translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation>Arquivo não encontrado</translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation>Desculpe, não encontrei nenhum decodificador para o arquivo: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation>Erro abrindo arquivo</translation>
-    </message>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="obsolete">OpiePlayer</translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, Duração: </translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation>Nenhum decodificador encontrado</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Seleção de Lista de Repr.</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>No</source>
-        <translation>Não</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Sim</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Arquivo</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Circular</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Reproduzir</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation>Operaçoes de Reprodução</translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation>Escala</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>Você realmente deseja apagar
-esta lista de reprodução ?</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Remover da Lista de Repr.</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Mover p/ Cima</translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation>Houve um problema salvando alista de reprodução.
-Algumas entradas poderão estar ausentes na próxima vez que abrir a lista de reprodução</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Aleatório</translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Adicionar à Lista de Repr.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Remover</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Tela Cheia</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Limpar Lista</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Adicionar todos os arquivos de áudio</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Todos os arquivos de video</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Adicionar toodos os arquivos</translation>
-    </message>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePlayer</translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation>Salvar Lista de Repr.</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Mover p/ Baixo</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>Sem espaço</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>Remover Lista de Repr. ?</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePlayer</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/netsetup.ts b/i18n/pt_BR/netsetup.ts
deleted file mode 100644
index 059a28f..0000000
--- a/i18n/pt_BR/netsetup.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished">Adicionar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
-    </message>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished">Adicionar Serviço de Rede</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished">&lt;P&gt;Estes são os serviços de rede disponíveis para serem adicionados.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Erro</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Somente um %1 pode ser adicionado. Remova o atual, ou mude suas propriedades</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Rede</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished">Adicionar...</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished">Rede</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Remover</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished">Propriedades</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished">Atual</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished">Serviços</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished">Estes são os serviços de rede disponíveis para você.</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished">&lt;p&gt;Este é o estado dos serviços em execução.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/networksettings.ts b/i18n/pt_BR/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/pt_BR/networksettings.ts
+++ b/i18n/pt_BR/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/odict.ts b/i18n/pt_BR/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/pt_BR/odict.ts
+++ b/i18n/pt_BR/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/oipkg.ts b/i18n/pt_BR/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/pt_BR/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/opie-console.ts b/i18n/pt_BR/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/pt_BR/opie-console.ts
+++ b/i18n/pt_BR/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opie-login.ts b/i18n/pt_BR/opie-login.ts
index 42551e6..f4806d5 100644
--- a/i18n/pt_BR/opie-login.ts
+++ b/i18n/pt_BR/opie-login.ts
@@ -1,83 +1,83 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
+        <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opie-sheet.ts b/i18n/pt_BR/opie-sheet.ts
deleted file mode 100644
index 322b113..0000000
--- a/i18n/pt_BR/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/opieirc.ts b/i18n/pt_BR/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/pt_BR/opieirc.ts
+++ b/i18n/pt_BR/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opiemail.ts b/i18n/pt_BR/opiemail.ts
deleted file mode 100644
index 270274c..0000000
--- a/i18n/pt_BR/opiemail.ts
+++ b/dev/null
@@ -1,373 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished">Responder</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished">Responder a Todos</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished">Apagar</translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished">CC</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished">Para:</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished">Enviar</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished">De:</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished">Fila</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished">Reiniciar</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished">Cancelar</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished">Assunto</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>Mail</source>
-        <translation>Correio</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation>Pastas de Mensagem</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation>Compor</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation>Configurar OpieMail</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished">&amp;Adic.</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nome</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished">Usuário</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished">Entrada</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished">Pasta</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished">Saida</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished">Servidor</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished">Transporte</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished">Protocolo</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished">&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished">Identidade</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished">&amp;Modificar</translation>
-    </message>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished">Configuração OpieMail</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished">Nome da Pasta</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished">Pastas</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished">Apagar a caixa?
-Todas as mensagens serão removidas.</translation>
-    </message>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished">Apagar caixa</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished">Configuração de Pasta OpieMail</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished">Descrição</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished">Assinatura</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished">E-Mail</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished">Organização:</translation>
-    </message>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished">OpieMail - Configuração de Identidade</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished">Identidade</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished">Responder Para</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished">Use para enviar</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>110</source>
-        <translation type="unfinished">110</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished">Porta</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished">Vericar a cada:</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished">&amp;Manter Correio no Servidor</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"> minutos</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished">Pasta de Destino</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished">Habilitar checagem periódica</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished">Senha</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished">Protocolo</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished">Servidor:</translation>
-    </message>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished">OpieMailEntrada</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished">Nome de Usuário:</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished">&amp;Remover correio do servidor quando for apagado localmente.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>25</source>
-        <translation type="unfinished">25</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished">Porta</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished">Servidor requer autenticação</translation>
-    </message>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished">OpieMailSaida</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished">Senha</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished">Protocolo</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished">Servidor:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished">Nome de Usuário:</translation>
-    </message>
-</context>
-<context>
-    <name>QMailCompose</name>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">Responder</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Apagar</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">Responder a Todos</translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>To</source>
-        <translation>Para</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation>Mover Para</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation>Remetente</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation>(Re)Editar</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation>Copiar Para</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation>Assunto</translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">Responder</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">Responder a Todos</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Apagar</translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/opieplayer.ts b/i18n/pt_BR/opieplayer.ts
index b8f82ba..b142db6 100644
--- a/i18n/pt_BR/opieplayer.ts
+++ b/i18n/pt_BR/opieplayer.ts
@@ -1,268 +1,258 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opieplayer2.ts b/i18n/pt_BR/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/pt_BR/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/opierec.ts b/i18n/pt_BR/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/pt_BR/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/osearch.ts b/i18n/pt_BR/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/pt_BR/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/patience.ts b/i18n/pt_BR/patience.ts
index 5fa805a..73ccab5 100644
--- a/i18n/pt_BR/patience.ts
+++ b/i18n/pt_BR/patience.ts
@@ -1,74 +1,98 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Play</source>
         <translation>Jogar</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>A&amp;trair para Posição</translation>
+        <translation type="obsolete">A&amp;trair para Posição</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Atrair para Posição</translation>
+        <translation type="obsolete">Atrair para Posição</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Virar Três Cartas</translation>
+        <translation type="obsolete">Virar Três Cartas</translation>
     </message>
     <message>
         <source>Patience</source>
         <translation>Paciência</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Mudar Verso das Cartas</translation>
+        <translation type="obsolete">&amp;Mudar Verso das Cartas</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Mudar verso das Cartas</translation>
+        <translation type="obsolete">Mudar verso das Cartas</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Virar Uma Carta</translation>
+        <translation type="obsolete">Virar Uma Carta</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/qpdf.ts b/i18n/pt_BR/qpdf.ts
index 2f03c32..828cbdf 100644
--- a/i18n/pt_BR/qpdf.ts
+++ b/i18n/pt_BR/qpdf.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>50%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>75%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>125%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>150%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>200%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File does not exist !</source>
+        <source>File does not exist!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 00ee54b..16f631a 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,253 +1,253 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
         <translation type="unfinished">Sincronizando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/reader.ts b/i18n/pt_BR/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/pt_BR/reader.ts
+++ b/i18n/pt_BR/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/rotation.ts b/i18n/pt_BR/rotation.ts
deleted file mode 100644
index c5c4812..0000000
--- a/i18n/pt_BR/rotation.ts
+++ b/dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished">Ajuste de Rotação</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index d9a927d..5255944 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -1,107 +1,119 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar senha</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Senha incorreta</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Ajustar senha</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A senha inserida está incorreta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Any</source>
         <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished">Mudar a senha</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished">Ajustes</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished">Limpar a senha</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished">Requisitar senha ao ligar</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation type="unfinished">192.168.129.0/24 (padrão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/snake.ts b/i18n/pt_BR/snake.ts
index 97a39c2..83be402 100644
--- a/i18n/pt_BR/snake.ts
+++ b/i18n/pt_BR/snake.ts
@@ -1,44 +1,52 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Cobra</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>COBRA !</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Pressione Qualquer Tecla Para Começar um Novo Jogo</translation>
+        <translation type="obsolete">Pressione Qualquer Tecla Para Começar um Novo Jogo</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>     Pontos :    %1   </translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use as teclas de cursor para guiar a
 cobra para que coma os ratos. Você não deve
 bater nas paredes, cantos ou na própria cauda.</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FIM DE JOGO !
  Seus Pontos:  %1</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Pressione Qualquer Tecla Para Começar</translation>
+        <translation type="obsolete">Pressione Qualquer Tecla Para Começar</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/spreadsheet.ts b/i18n/pt_BR/spreadsheet.ts
deleted file mode 100644
index 479a44d..0000000
--- a/i18n/pt_BR/spreadsheet.ts
+++ b/dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>New</source>
-        <translation>Novo</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Editar</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Arquivo</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Fechar</translation>
-    </message>
-    <message>
-        <source>Spreadsheet</source>
-        <translation>Planilha de Cálculo</translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation>Limpar Célula</translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation>Equação</translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/pt_BR/stockticker.ts b/i18n/pt_BR/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/pt_BR/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/sysinfo.ts b/i18n/pt_BR/sysinfo.ts
index 4e032d3..0889c56 100644
--- a/i18n/pt_BR/sysinfo.ts
+++ b/i18n/pt_BR/sysinfo.ts
@@ -1,303 +1,273 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU pelo sistema (%)</translation>
     </message>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por aplicações (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memória Total: %1 kB</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Em cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <source>You really want to send %1 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processo</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>System Info</source>
         <translation>Informações do Sistema</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gerado em: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel do Linux&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/systemtime.ts b/i18n/pt_BR/systemtime.ts
index 4834641..c16c802 100644
--- a/i18n/pt_BR/systemtime.ts
+++ b/i18n/pt_BR/systemtime.ts
@@ -1,309 +1,243 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished">Formato de hora</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished">12/24 horas</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished">24 horas</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished">12 horas</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished">Formato de data</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished">Semana começa no(a)</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished">Domingo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished">Segunda</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Semana começa no(a)</translation>
-    </message>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zona Horária</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 horas</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Segunda</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 horas</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Formato de data</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Formato de hora</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished">Hora</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished">Minuto</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Data</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/tetrix.ts b/i18n/pt_BR/tetrix.ts
index 709ddec..e1461d3 100644
--- a/i18n/pt_BR/tetrix.ts
+++ b/i18n/pt_BR/tetrix.ts
@@ -1,30 +1,64 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished">Nível</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Next</source>
         <translation>Próxima</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Nível</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Pontos</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Removidas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 14f5108..20cc58f 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -1,265 +1,269 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
         <source>Cut</source>
         <translation>Cortar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Aproximar</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Quebrar linhas</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Localizar Próx.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Editor de Texto</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Afastar</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Fechar Localização</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Salvar Como</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Localizar...</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Iniciar com novo arquivo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Fonte</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished">Sem Nome</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>read</source>
         <translation>ler</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Dono</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>dono</translation>
     </message>
     <message>
         <source>write</source>
         <translation>escrever</translation>
     </message>
     <message>
         <source>others</source>
         <translation>outros</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>Ajustar Permissões de Arquivo</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ajustar permissões de arquivo para:</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/tictac.ts b/i18n/pt_BR/tictac.ts
index bab95fe..faaf1d7 100644
--- a/i18n/pt_BR/tictac.ts
+++ b/i18n/pt_BR/tictac.ts
@@ -1,42 +1,49 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/tinykate.ts b/i18n/pt_BR/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/pt_BR/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 639be91..d113f4f 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,118 +1,139 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished">Configuração do Hoje</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
+        <source>Misc</source>
+        <translation type="unfinished">Misc</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>minutes inactive</source>
+        <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
     <message>
-        <source>Misc</source>
-        <translation type="unfinished">Misc</translation>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon size</source>
+        <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the icon size in pixel</source>
+        <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How often should Today refresh itself</source>
+        <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 0774b46..5176e27 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -1,561 +1,591 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
+        <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
+        <source>Alarms</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished">Editar Tarefa</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished">Enviar</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished">Localizar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished">Sem Espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Tarefas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">Impossível editar dados durante sincronização</translation>
+        <translation type="obsolete">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information about this task here.</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo List</source>
+        <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt_BR/ubrowser.ts b/i18n/pt_BR/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/pt_BR/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/usermanager.ts b/i18n/pt_BR/usermanager.ts
index 282a43f..28f3895 100644
--- a/i18n/pt_BR/usermanager.ts
+++ b/i18n/pt_BR/usermanager.ts
@@ -1,31 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
+        <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/wellenreiter.ts b/i18n/pt_BR/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/pt_BR/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/pt_BR/wlansetup.ts b/i18n/pt_BR/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/pt_BR/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/.directory b/i18n/sl/.directory
index 716ac9f..06402c0 100644
--- a/i18n/sl/.directory
+++ b/i18n/sl/.directory
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Name=Slovenian
 Name[da]=Slovensk
 Name[de]=Slowenisch
 Name[es]=Esloveno
 Name[it]=Sloveno
 Name[pt]=Esloveno
 Name[pt_BR]=Esloveno
 Name[sl]=Slovenščina
+Name[nl]=Slowaaks
\ No newline at end of file
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index 6d4bff6..e473833 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -1,917 +1,916 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Polno ime</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Izberi</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Pošlji epošto</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Prežarči vnos</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urejati podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Uredi naslov</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>Uvozi vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri iskalnik</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>Shrani vse podatke</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Natavitve</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ne najdem</translation>
     </message>
     <message>
         <source>List</source>
         <translation>Seznam</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>Kartice</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>Kartica</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>Začni iskanje</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Pravi tip datoteke?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Da</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>Ne najdem stika za
 iskani vzorec!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Izbrana datoteka
 nima končnice &quot;.vcf&quot;.
 Ali jo res želite odpreti?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Dodam stik?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Ali res želite dodati stik za 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Vse da</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>Izvozi vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>Morate izbrati stik!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Morate nastaviti ime datoteke !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Stil poizvedbe</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>Uporabi regularne izraze</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>Uporabi (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči male in velike črke</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>Pošta</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>Raje QT-Pošta</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>Raje Opie-Pošta</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>Obvestilo: QT-Pošta je
 že naložena v SHARP-ovem
 privzetem ROM-u. Opie-Pošta
 je zastonj!</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Razno</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>Nastavitve iskalnika</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Mala</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>Red</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>Izberite red stikov:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>Kliknite na zavihek, da izberete</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>Nastavitve za stil iskalne poizvedbe</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>Iskalnik pričakuje regularne izraze, če so ti izbrani</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>Iskalnik pričakuje enostavne zvezdice</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>Če izbrano, iskalnik razlikuje med velikimi in malimi črkami</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>Velikost pisave za seznam- in kartični pogled</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>Nastavitve pisave za seznam in kartični pregled</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>Uporabi Sharpov poštni program, če je navoljo</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>Uporabi OPIE pošto že je naložena</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>Premakni izbrani parameter eno vrstico gor</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>Premakni izbrani parameter eno vrstico dol</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>Seznam vseh dostopnih parametrov</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>Dodaj izbrani parameter iz seznama spodaj v gornji seznam</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>Odstrani izbrani parameter iz gornjega seznama</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Red (gor -&gt; dol) definira prvi stik prikazan v naslednjem stolpcu seznama</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>Orodna-/Menujska vrstica</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Popravljeno</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>Preklopi na stalno orodno-/menujsko vrstico, ko se program ponovno zažene !</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>Mobilno</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>Preklopi na mobilno orodno-/menujsko vrstico, ko se program ponovno zaženo !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Službeno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>Albanija</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>Alžirija</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>Ameriška Samoa</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>Andora</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>Avstralija</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>Avstrija</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>Azerbaijan</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>Bahami</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>Bangladeš</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>Belorusija</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>Belgija</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>Bermudi</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>Bhutan</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>Bouvetski otoki</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>Brazilija</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>Bulgarija</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>Burkini Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>Kambodža</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>Cape Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>Kajmanovi otoki</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>Čad</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>Čile</translation>
     </message>
     <message>
         <source>China</source>
         <translation>Kitajska</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Božični otok</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>Kulumbija</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>Kongo</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>Kukovi otoki</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>Kosta Rika</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>Cote d&apos;Ivoire</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>Hrvaška</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>Kuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>Ciper</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>Češka</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>Danska</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>Dominikanska republika</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>Vzhodni Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>Ekvador</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>Egipt</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>Ekvatorialna Gvineja</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>Ertireja</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>Estonija</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>Etiopija</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>Falklandski otoki</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>Faroeski otoki</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>Fidži</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>Finska</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>Francoska Gvineja</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>Francoska Polinezija</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>Gabon</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>Gambija</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>Džordžija </translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>Grčija</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>Grenlandija</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>Grenada</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>Gvatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>Gvineja</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>Gujana</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>Holy See</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>Madžarska</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>Islandija</translation>
     </message>
     <message>
         <source>India</source>
         <translation>Indija</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>Indonezija</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>Irska</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>Izrael</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>Italija</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>Jordan</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>Kazakhstan</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>Kenija</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>Koreja</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>Latvija</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>Libanon</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>Lestoša</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>Liberija</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>Lithuana</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>Luksemburg</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>Makedonija</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>Madagaskar</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>Malezija</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>Maldivi</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>Martinique</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>Mauritania</translation>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 08bfe6a..7f57720 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -1,315 +1,365 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>NapredniDu</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Prikaži skrite datoteke</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>Poženi ukaz</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Poženi ukaz z izhodom</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Opomba</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>Prekopiraj kot</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Izhod iz programa</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Prežarči ven</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir poslan.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Izvrši</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Odpri kot besedilo</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>Ustvari povezavo</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>Prestavi</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>Informacije o datoteki</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>Nastavi pravice</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Prežarči datoteko</translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation>Kopiraj</translation>
+        <translation type="unfinished">Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
-        <translation>Kot</translation>
+        <translation type="unfinished">Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>Ne morem kopirati</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>v
 </translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>Ne morem prenesti
 </translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>Dodaj med dokumente</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>Ali zares izbrišem
 %1 datotek?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Izbrišem imenik?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>Res skopiram
 %1 datotek?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>Datoteka obstaja!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>
 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>že obstaja.
 Ali jo res želite izbrisati?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>%1 obstaja. Ali prepišem?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>Ne morem skopirati %1 v %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>Advanced FileManager
 pravice pridržane 2002-2003
 LJ.Potter&lt;llornkcor@handhelds.org&gt;
 in je licencirano pod GPL</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!!</source>
-        <translation>Ne morem odstraniti trenutnega imenika
+        <translation type="obsolete">Ne morem odstraniti trenutnega imenika
 iz zaznamkov.
 Ni med zaznamki!!</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Dodaj imenik med zaznamke</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Odstrani trenutni imenik iz zaznamkov</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/appskey.ts b/i18n/sl/appskey.ts
deleted file mode 100644
index c1f78bd..0000000
--- a/i18n/sl/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>Nastavi programsko tipko</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>Knjiga naslovov</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>Dom</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>Lista</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Pošta</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>Koledar</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index b06f4e4..d6fcac5 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -1,566 +1,694 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filter kategorij</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Izberite eno ali več skupin</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Berem nastavitve...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Odstrani
 </translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>Naloži
 </translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>Nadgradi
 </translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>(Ponovno naloži)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>(Nadgradi)</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>Prostor na voljo</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začni</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>
 **** Uporabnik je kliknil PREKINI ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>**** Proces prekinjen ****</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Shrani izhod</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Neznano</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Prisili odvisne</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Prisili ponovno nalaganje</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>Prisili odstranjevanje</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>Prisili prepis</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>Stopnja informiranosti</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>Samo napake</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>Normalna sporočila</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>Informativna sporočila</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>Problematičen izhod</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - Paketni upravljalnik</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>Tu vpišite besedilo za iskanje.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>Kliknite tu, da skrijete Hitroskočno orodno vrstico.</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>Posodobi sezname</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>Kliknite tu, da posodobite paketne sezname iz strežnikov.</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Nadgradi</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>Kliknite tu, da nadgradite vse naložene pakete, če je novejša različica na voljo.</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>Kliknite tu, da prenesete k sebi trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>Uveljavi spremembe</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>Kliknite tu, da naložite, odstranite ali posodbite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Dejanja</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>Prikaži pakete, ki niso naloženi</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>Kliknite tu, da prikažem nenaložene pakete, ki so na voljo.</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>Prikaži naložene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi.</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>Prikaži posodobljene pakete</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>Kliknite tu, da prikažem pakete, ki so trenutno naloženi na tej napravi in imajo na voljo novejšo različico.</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>Filter po kategoriji</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>Kliknite tu, da prikažem pakete, ki pripadajo eni kategoriji.</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>Nastavi filter kategorije</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>Kliknite tu, da zamenjate kategorijo paketa za uporabljen filter.</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>Kliknite tu, da najdete besedilo v paketnih imenih.</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>Najdi naslednjo</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>Kliknite tu, da najdete naslednje ime paketa, ki vsebuje iskano besedilo.</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>Hitroskočne smerne tipke</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>Kliknite tu, da prikažem/skrijem smerne tipke, da se lažje premikate po paketnem seznamu.</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Kliknite tu, da spremenite nastavitve temu programu.</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Kliknite tu, da skijem iskalno orodno vrstico.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Strežniki:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Kliknite tu, da izberete paketni vir.</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>Paketi</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>To je seznam vseh paketev iz strežniškega vira izbranega zgoraj.
 
 Modra pika pri imenu paketa pove, da je paket trenutno nameščen.
 
 Modra pika z zvezdico pove, da je novejša različica paketa na voljo iz strežniškega vira.
 
 Kliknite v škatlico levo od pakete, da le tega izberete.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Kliknite tu, da odstranite trenutno izbran(e) paket(e).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam strežnikov:
 %1</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Gradim seznam paketov za:
 %1</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>Osvežujem strežniški seznam paketov</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>OPOZORILO: Posodabljanje med 
 tem, ko Opie teče
 NI priporočljivo!
 
 Ste prepričani?
 </translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>Posodabljam naložene pakete</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>Ali ste prepričani da želite izbrisati
 %1?</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>Ste prepričani?</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>Cilj prenosa</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>Vpišite pot za prenos za</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>Naloži odaljeni paket</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>Vpišite lokacijo paketa</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>Nič ni za naredit</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>Nič paketov izbranih</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>Želite odstraniti ali ponovno naložiti
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Odstrani ali ponovno naloži</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Ponovno naloži</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>P</translation>
+        <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Želite odstraniti ali nadgraditi
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Odstrani ali nadgradi</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>N</translation>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>Posodabljam Zaganjalnik...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Opis&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Naloženo na&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Velikost&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Odsek&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Ime datoteke&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Naložena različica&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>&lt;p&gt;&lt;b&gt;Različica, ki je na voljo&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>Informacije o paketu</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>Informacije o paketu niso na voljo</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zapri</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished">Odstrani</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Strežniki</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>Posredniki</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Strežnik</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>Aktivni strežnik</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>Posodobi</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>Cilj</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>Povezava do korena</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>HTTP posrednik</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Vključen</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FTP posrednik</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>Uporabniško ime:</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>Geslo:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/backgammon.ts b/i18n/sl/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/sl/backgammon.ts
+++ b/i18n/sl/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/backup.ts b/i18n/sl/backup.ts
index 40be7f1..f9a04be 100644
--- a/i18n/sl/backup.ts
+++ b/i18n/sl/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>Kopiraj in restavriraj... delam...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programi</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>Shrani na</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiraj</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restavriraj</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Izberi vir</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Stolpec 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restavriraj</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/bounce.ts b/i18n/sl/bounce.ts
index ccd7ae7..e4b6407 100644
--- a/i18n/sl/bounce.ts
+++ b/i18n/sl/bounce.ts
@@ -1,108 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>Odoboj</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;Nova igra</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>&amp;Ustavi igro</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Igra</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>Točke: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>Življenj: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>Zapolnjeno: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>Čas: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>Stopnja odboja %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>Točke: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>Igra zaustavljena.
 Pritisnite P za nadaljevanja!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>Konec igra!
 Točke: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>Čas: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>Življenj: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>Zapolnjeno: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>Zapolnjeno: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>Uspešno ste odtranili več kot 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 točk: 15 točk na življenje
 </translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 točk: Bonus
 </translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 točk: Skupno točk
 
 </translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>Na stopnji %1.
 Dobite %2 življenj!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/calibrate.ts b/i18n/sl/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/sl/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index 441d224..02afc1e 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -1,520 +1,524 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova čekovna knjižica</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcije</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafi</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Vpišite ime čekovne knjižice.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Izberite tip čekovne knjižice.</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>Prihranki</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>Preverjam</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>CD</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>Denarni trg</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>Skupni fond</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>Drugo</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banka:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Vpišite ime banke za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Številka računa:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Vpišite številko računa za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Številka PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Vpišite številko PIN za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Začetno stanje:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Vpišite začetno stanje za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Vpišite dodatne informacije za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>Trenutno stanje: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>Ta prostor prikazuje trenutno stanje v čekovni knjižici.</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>To je seznam vseh vnesenih transakcij za to čekovno knjižico.
 
 Da uredite vnose po določenem polju, kliknite na ime stolpca.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Vsota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknite tu, da dodate novo transakcijo.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Izberite transakcijo, nato pa kliknite tu, da jo uredite.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Izberite željen graf spodaj in nato kliknite na gumb Riši.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknite tu, da izberete željeni tip grafa.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Stanje računa</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Dvigi po kategoriji</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Pologi po kategoriji</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Riši</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknite tu, da narišem izbran graf.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>Trenutno stanje: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Izbriši transakcijo</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Zaščita z geslom</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknite tu, da vključite/izključite zaščito z geslom na čekovni knjižici.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Številka</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite vaše geslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potrdite geslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prosim potrdite vaše geslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prosim vnesite vaše geslo, da potrdite odstranitev zaščite z geslom:</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Spremeni nastavitve čekovne knjižice</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Vpšite simbol za valuto:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Vpišite vaš lokalen simbol za valuto.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Prikaži, če je čekovna knjižica zaščitena
 z geslom</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže ali je čekovna knjižica zaščitena z geslom.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Prikaži stanja čekovne knjižice</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže trenutno stanje za vsako čekovno knjižico.</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknite tu, da ustvarite novo čekovno knjižico.
 
 Lahko pa tudi izberete Nova iz menuja.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo uredite.
 
 Lahko tudi izberete Uredi iz menija ali pa kliknete in zadržite na imenu čekovne knjižice.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.
 
 Lahko tudi izberete Izbriši iz menuja.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To je seznam vseh čekovnih knjižic, ki so trenutno na voljo.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Izbriši čekovno knjižico</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknite tu, da spremenite nastavitve za ta program.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Stanje</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite geslo:</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcija za</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Dvig</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Izberite ali je transakcija dvig ali polog.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Polog</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Izberite datum za transakcijo.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Številka:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Vpišite številko čeka.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Vpišite opis transakcije.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Izberite kategorijo transakcije.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Izberite tip transakcije.
 
 Možnosti, ki so na voljo so odvisne od tega ali je transakcija polog ali pa dvig.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Vsota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto transakcije.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Pristojbina:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto pristojbine povezane s to transakcijo.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Vnesite dodatne informacije za transakcijo.</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>Avto</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>Računi</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>Elektronika</translation>
+        <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>Zabava</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>Najem</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditna kartica</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>Različni krediti</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotovina</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/clock.ts b/i18n/sl/clock.ts
index 1259236..d7098f8 100644
--- a/i18n/sl/clock.ts
+++ b/i18n/sl/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Dremež</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Ura</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Štoparica</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Nastavi alarm</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>Alarm je vključen</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>Alarm je izključen</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>Nastavi datum in uro.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Ura: Zamudili ste alarm.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Nastavi alarm</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Ura</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuta</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Zakasnitev dremeža
 (minut)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>mp3 alarm</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index a2e6b7f..28fca49 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -1,811 +1,838 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Teden. seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Dogodek je potencialno daljsi,
 kot interval med ponovitvijo.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Uredi dogodke</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Koledar ne more shraniti
 vaših sprememb.
 Sprostite nekaj prostora in
 poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Neznano)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Napaka!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popravi</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Podvojeni dogodek</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>Uredi...</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Podvoji</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začni pregledovati dogodke</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Začetni čas:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavitev alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prednastavitev alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>Stil vrstice:</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzet</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>Srednji</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velik</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>Pogledi</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>Privzet pogled:</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>Tedenski seznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>Skoči na trenutni čas</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>Prikaz časa</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začetek-Konec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
-        <translation>P</translation>
+        <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
-        <translation>T</translation>
+        <translation type="obsolete">T</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
-        <translation>Č</translation>
+        <translation type="obsolete">Č</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
-        <translation>P</translation>
+        <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
-        <translation>S</translation>
+        <translation type="obsolete">S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
-        <translation>N</translation>
+        <translation type="obsolete">N</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ponovi...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dnevno...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tedensko...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mesečno...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Letno...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>Začetni čas</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Končni čas</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nov dogodek</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Sestanek</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Kosilo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večerja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cel dan</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tiho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glasno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časovni pas</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začetek - Konec</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opombe...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Uredi opombo</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Kosilo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Vsak %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Vsak %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 od vsakega</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ne ponovi</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mesecev</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>week</source>
         <translation>teden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source> and </source>
         <translation>in</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 in</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, in</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ponavljajoči dogodek</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Vsak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frekvenca</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končaj na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>TedenskaSpremenljivka</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meseci</translation>
     </message>
     <message>
         <source>years</source>
         <translation>leta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/drawpad.ts b/i18n/sl/drawpad.ts
index 130d5ae..30f1785 100644
--- a/i18n/sl/drawpad.ts
+++ b/i18n/sl/drawpad.ts
@@ -1,440 +1,448 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Zbriši vse</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Uvozi</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Uvozi...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Izvozi</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Izvozi...</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>Orodja</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>Nova stran</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Pobriši stran</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Izbriši stran</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>Razveljavi</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>Prva stran</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>Prejšna stran</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>Naslednja stran</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>Zadnja stran</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>Riši točko</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>Riši črto</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>Riši pravokotnik</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>Riši zapolnjen pravokotnik</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>Riši elipso</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>Riši zapolnjeno elipso</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>Zapolni območje</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>Zbriši točko</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>Debelina svinčnika</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Barva svinčnika</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Barva polnila</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>Vstavi besedilo</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>Ikoniziran pogled</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>Ikoniziran pogled...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>Informacije o strani</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>Informacije o strani...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>Ali želite pobrisati
 trenutno stran?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>Ali želite izbrisati
 trenutno stran?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>Ali želite izbrisati
 vse strani?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Mehčanje robov</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Kliknite tu, da dodate nov list.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Kliknite tu, da zbrišete trenutni list.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Kliknite tu, da odstranite trenutni list.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>Kliknite tu, da prekinete zadnje dejanje.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>Kliknite tu, da ponovno izvedete zadnje dejanje.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>Kliknite tu, da vidite prvo stran.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>Kliknite tu, da vidite prejšno stran.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>Kliknite tu, da vidite naslednjo stran.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>Kliknite tu, da vidite zadnjo stran.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>Kliknite tu, da izberete eno od orodij za risanje črt.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>Kliknite tu, da izberete eno od orodij za risanje pravokotnikov.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>Kliknite tu, da izberete eno od orodij za risanje elips.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>Kliknite tu, da izberete orodje za risanje besedila.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>Kliknite tu, da izberete orodje za zapolnjevanje.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>Kliknite tu, da izberete orodje za brisanje.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>Kliknite tu, da izberete debelino risalnega svinčnika.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>Kliknite tu, da izberete barvo s katero se riše.</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>Kliknite tu, da izberete barvo s katero se polni.</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>Risalna plošča - Stran %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Izbira strani</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>Trenutna</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>Obseg</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>Do:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Izvozi kot</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>Oblika:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>Risalna plošča - Izvoz</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>Avtomatičen predogled</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>Predogled</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>Risalna plošča - Uvoz</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>Nova stran</translation>
     </message>
     <message>
         <source>White</source>
         <translation>Belo</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>Barva svinčnika</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>Barva polnila</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Širina:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Višina:</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>Informacije o strani</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>Naslov:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>Širina:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>Višina:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>Naslov: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>Dimenzija: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>Datum: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Vstavi besedilo</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>Risalna plošča - Ikoniziran pogled</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>Pobriši stran</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>Ali želite pobrisati
 izbrano stran?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>Izbriši stran</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Ali želite izbrisati
 izbrano stran?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>Kliknite tu, da dodate nov list.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>Kliknite tu, da zbrišete trenutni list.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>Kliknite tu, da odstranite trenutni list.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>Kliknite tu, da premaknete trenuten list gor za eno vrstico v seznamu.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>Kliknite tu, da premaknete trenuten list dol za eno vrstico v seznamu.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/euroconv.ts b/i18n/sl/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/sl/euroconv.ts
+++ b/i18n/sl/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/filebrowser.ts b/i18n/sl/filebrowser.ts
deleted file mode 100644
index 24c211d..0000000
--- a/i18n/sl/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Upravljalec datotek</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>Imenik</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>Uredi</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>po imenu</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>po velikosti</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>po datumu</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>po tipu</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>Urejeno</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>Skrite</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>Povezave</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Pogled</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>Predhodni imenik</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>Nadimenik</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nov imenik</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Izreži</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiraj</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Prilepi</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>/</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>Ikonce</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>Upravljalec datotek</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>Ne morem prikazati /dev/ imenika.</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>&amp;Vredu</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>Preimenuj datoteko</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>Preimenovanje spodletelo!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>Prilepi datoteko</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>Prilepi spodletel!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>Vredu</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>Izreži datoteko</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>Izreži spodletel!</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Izbriši</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>Ste prepričani?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Da</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Ne</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>Izbris spodletel!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>Nov imenik</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>Ustvarjanje imenika spodletelo!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>Zaženi aplikacijo</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>Zagon spodletel!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>Dodaj med dokumente</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>Poženi</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>Poglej kot besedilo</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>Preimenuj</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>Izreži</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiraj</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>Prilepi</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>Spremeni pravice</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>Izberi vse</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>Odizberi vse</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>Spremeni pravice</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>Nastavi pravice</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>Nastavi pravice za:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>lastnik</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>skupina</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>drugi</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>Lastnik</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Skupina</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>beri</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>piši</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>izvrši</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/formatter.ts b/i18n/sl/formatter.ts
index a022e1d..66753c8 100644
--- a/i18n/sl/formatter.ts
+++ b/i18n/sl/formatter.ts
@@ -1,174 +1,214 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>Formater</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>Tip skladišča</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>Datotečni sistemi</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Glavni</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>OPOZORILO:
+        <translation type="obsolete">OPOZORILO:
 Spreminjanje parametrov na tej
 strani lahko povzroči, da vaš
 sistem ne bo pravilno deloval!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>Uredi fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Preveri disk</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Naprava</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Priklopna točka</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>Format?!?</translation>
+        <translation type="obsolete">Format?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>Zares formatiram
 </translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 z</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>datotečnim sistemom?!?
+        <translation type="obsolete">datotečnim sistemom?!?
 Zgubili boste vse podatke!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Ne morem formatirati .
 Neznan tip</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>Izhod formaterja</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>Poizkušam odklopiti.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>odklop ni uspel!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;Vredu</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>Ne morem odklopiti.
 Naprava je zasedena!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>Poizkušam formatirat.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Ni take naprave!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 
 je bila uspešno formatirana.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>Poizkušam priklopiti.</translation>
+        <translation type="obsolete">Poizkušam priklopiti.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>Priklop kartice ni uspel!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 je bila uspešno priklopljena.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>Zdaj lahko zaprete izhodno okno.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Notranje</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>Tip skladišča:</translation>
+        <translation type="obsolete">Tip skladišča:</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Skupaj: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Uporabljeno: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Na voljo: %1 kB ( %d mB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/helpbrowser.ts b/i18n/sl/helpbrowser.ts
index a9fddbf..a74abf8 100644
--- a/i18n/sl/helpbrowser.ts
+++ b/i18n/sl/helpbrowser.ts
@@ -1,37 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Nazaj</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Dodaj zaznamek</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Odstrani iz zaznamkov</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Zaznamki</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Brskalnik pomoči</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation>BrskalnikPomoči</translation>
+        <translation type="obsolete">BrskalnikPomoči</translation>
+    </message>
+    <message>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/kpacman.ts b/i18n/sl/kpacman.ts
index 1897648..34b3728 100644
--- a/i18n/sl/kpacman.ts
+++ b/i18n/sl/kpacman.ts
@@ -1,248 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>Zamenjaj smerne tipke</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>Nedefinirana tipka</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Nova</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>&amp;Ustavi</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>&amp;Hiša slave</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>&amp;Izhod</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>&amp;Skrij miškin kazalec</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>&amp;Izberi grafično shemo</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>&amp;Ustavi v ozadju</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>&amp;Nadaljuj v ospredju</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>Zamenjaj &amp;tipke...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 Pacman za KDE namizje
 
 Program bazira na kodi od ksnake
 od Michel Filippi (mfilippi@sade.rhein-main.de).
 Na obliko je močno vplival pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Rad bi se zahvalil svoji punci Elke Krueers za
 10 letno prijateljstvo.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
         <source>Configuration Error</source>
-        <translation>Napaka pri nastavitvah</translation>
+        <translation type="obsolete">Napaka pri nastavitvah</translation>
     </message>
     <message>
         <source>There are no schemes defined,
 or no scheme is selected.</source>
-        <translation>Nobena shema ni definirana
+        <translation type="obsolete">Nobena shema ni definirana
 ali pa ni nobena izbrana.</translation>
     </message>
+    <message>
+        <source>KPacman</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Bitpisava ne more biti uporabljena.
 
 Datoteka &apos;@FONTNAME@&apos; ne obstaja
 ali pa je v neznani obliki.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>KONEC IGRE</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>IGRALEC ENA</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>PRIPRAVLJEN!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJEN</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>ZNAK</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>VZDEVEK</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SENCA</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;UTRIPAJOČ&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-HITRI</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;ROŽNAT&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BOJEČ</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;MODER&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PRITISNI SMERNO TIPKO ZA ZAČETEK</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1IG</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>NAJVIŠJE TOČKE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2IG</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>ČESTITAM</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>DOSEGLI STE</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>TOČKE MED 10 NAJBOLJŠIMI.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>MES   TOČKE  IME       DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>USTAVLJENA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@.@MM@.@YY@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Slike ne morejo biti ustvarjene.
 
 Datoteka &apos;@PIXMAPNAME@&apos; ne obstaja
 ali pa je nezanega formata.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Napaka pri zagonu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/launchersettings.ts b/i18n/sl/launchersettings.ts
index ca6db3e..0c29240 100644
--- a/i18n/sl/launchersettings.ts
+++ b/i18n/sl/launchersettings.ts
@@ -1,208 +1,223 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Nastavitve zaganjalnika</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Preklopna vrstica</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zavihki</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Naloži programčke v O-menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Prikaži zaganjalnikove zavihke v O-menuju</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Obkljukajte programčke, ki jih želite imeti v O-menuju.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Doda vsebino zaganjalnikovih zavihkov v menu in v O-menu.</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Sample 1</source>
+        <translation type="unfinished">Primer 1</translation>
+    </message>
+    <message>
+        <source>Sample 2</source>
+        <translation type="unfinished">Primer 1</translation>
+    </message>
+    <message>
+        <source>Sample 3</source>
+        <translation type="unfinished">Primer 1</translation>
+    </message>
+</context>
+<context>
     <name>SampleView</name>
     <message>
         <source>Sample 1</source>
-        <translation>Primer 1</translation>
+        <translation type="obsolete">Primer 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
-        <translation>Primer 1</translation>
+        <translation type="obsolete">Primer 1</translation>
     </message>
     <message>
         <source>Sample 3</source>
-        <translation>Primer 1</translation>
+        <translation type="obsolete">Primer 1</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Uredi zavihek</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Ikone</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Predogled %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>To je grob pregled kako bo trenutno izbran zavihek izgledal.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Izberi prirejeno pisavo</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>Zravnano</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>barva</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>Slika</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>Izberi...</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Velikost:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Majhna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Barva:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Zaganjalnikovi zavihki:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Vklopi velik kazalnik zasedenosti</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>Vklopi utripajoč kazalnik zasedenosti</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Izberi zaganjalnikov zavihek, ki ga želite urediti ali izbrisati.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Doda nov zavihek v zaganjalnik.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Odpre novo okno za prireditev izbranega zavihka.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Izbriše zavihek iz zaganjalnika.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Vklopite to, če želite, da je velik kazalnik zasedenosti v sredini zaslona namesto v opravilni vrstici.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>Vklopite to, če želite, da je utripajoč kazalnik zasedenosti za zaganjanje programov v zaganjalniku.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Vsi zavihki</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Še ni implementirano</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Naloži programčke v opravilno vrstico:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Obkljukajte programčke, ki jih želite v opravilni vrstici.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libfreetypefactory.ts b/i18n/sl/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt_BR/libfreetypefactory.ts
+++ b/i18n/sl/lib.ts
diff --git a/i18n/sl/libbatteryapplet-ipaq.ts b/i18n/sl/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 004fb75..0000000
--- a/i18n/sl/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>Baterija za Ipaq</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation>Napaka</translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation>ne morem odpreti datoteke</translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation>Polnim obe napravi</translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation>Polnim</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>Odstotkov baterije do konca</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>Status baterije:</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>Dober</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>Nizek</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>Zelo nizek</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>Kritičen</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>Neznan</translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation>Na pomožnem napajanju</translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation>Napajanje vklopljeno</translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation>Zunanje napajanje nepriklopjeno</translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation>Čas baterije do konca</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>Odstotek baterije do konca:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>Čas baterije do konca:</translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation>Nobena baterija ni vstavljena</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zapri</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/libclockapplet.ts b/i18n/sl/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/sl/libclockapplet.ts
+++ b/i18n/sl/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/sl/libdialup.ts b/i18n/sl/libdialup.ts
deleted file mode 100644
index f5a327e..0000000
--- a/i18n/sl/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation>Poveži</translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uporabnik:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Geslo:</translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation>Telefon:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation>Modem</translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation>AT-klici:</translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation>ATDT</translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation>ATDP</translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation>Hitrost:</translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation>4800</translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation>9600</translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation>19200</translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation>38400</translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation>57600</translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation>115200</translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation>Čas čakanja:</translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation>1</translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation>sek</translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation>Kontrola pretoka:</translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation>Strojna kontrola pretoka</translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation>Klic na zahtevo</translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation>Ročno poveži in prekini</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation>sekund</translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation>Nedajvnostni odklop:</translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation>Avtomatično poveži in prekini</translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation>Ročno poveži, avtomatično prekini</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Mreža</translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation>Samodejno najdi imenske strežnike</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Prehod</translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation>Samozaznaj poti</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Prvi DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Drugi DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxy strežniki</translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation>Naprava:</translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation>IrDA</translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation>PCMCIA</translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation>Serijska</translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation>Čakam na aktivnost</translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation>Zaganjam modem</translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation>Povezujem</translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation>Avtoriziram</translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation>Brez klicnega zvoka</translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation>Brez nosilca</translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation>Številka je zasedena</translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation>Čas se je iztekel</translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation>Neuspešna povezava</translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation>Neuspešna avtorizacija</translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation>Povezan</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Nastavitve Proxy strežnika</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Brez Proxy strežnikov</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Samonastavi Proxy strežnik</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Nastavi Proxy strežnik</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Nastavitve:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Vrata:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Gostitelj:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Brez Proxy strežnika za:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/libflatstyle.ts b/i18n/sl/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/sl/libflatstyle.ts
+++ b/i18n/sl/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libinterfaces.ts b/i18n/sl/libinterfaces.ts
index acc5c3a..d731e4e 100644
--- a/i18n/sl/libinterfaces.ts
+++ b/i18n/sl/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>Napredne informacije o vmesniku</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP naslov</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>Vmesnik</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Maska podomrežja</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>DHCP informacije</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>DHCP strežnik</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>Zakup poteče</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>Zakup pridobljen</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Oddajanje</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC naslov</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>Informacije o vmesniku</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>&amp;Osveži</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>Us&amp;tavi</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>Ponovno zaž&amp;eni</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>&amp;Zaženi</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP naslov</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Maska podomrežja</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>MAC naslov</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>Oddajanje</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>&amp;Pogled naprednih informacij</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>Nastavitve vmesnika</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>Avtomatično zaženi</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>Statične IP nastavitve</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>Maska podomrežja</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>Primarni DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>IP naslov</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Prehod</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>Sekundarni DNS</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished">255.255.255.0</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>Ponovno zaženi vmesnik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libkppp.ts b/i18n/sl/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/sl/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/liblan.ts b/i18n/sl/liblan.ts
deleted file mode 100644
index a0251f1..0000000
--- a/i18n/sl/liblan.ts
+++ b/dev/null
@@ -1,138 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation>Nastavitve LAN</translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation>To ime že obstaja.
-Prosim izberite drugo
-ime.</translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation>LAN</translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation>Račun</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation>Nastavi TCP/IP informacije</translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation>Avtomatično pridobi TCP/IP informacije</translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation>TCP/IP</translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation>IP naslov</translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation>Prehod</translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation>Podmaska omrežja</translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation>Broadcast naslov</translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation>DNS</translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation>Prvi DNS</translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation>Drugi DNS</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation>Proxy strežniki</translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation>Obrazec2</translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation>Servis:</translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation>IP naslov:</translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation>Nastavitve Proxy strežnika</translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation>Brez Proxy strežnikov</translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation>Samonastavi Proxy strežnike</translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation>Nastavi Proxy strežnike</translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation>Nastavitve:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Vrata:</translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation>HTTP:</translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation>FTP:</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation>Gostitelj:</translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation>Brez Proxy strežnikov za:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/libliquid.ts b/i18n/sl/libliquid.ts
index a6aa3ac..cdb6ae1 100644
--- a/i18n/sl/libliquid.ts
+++ b/i18n/sl/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Stil Liquid</translation>
+        <translation type="unfinished">Stil Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Brez translucence</translation>
+        <translation type="unfinished">Brez translucence</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Črtasto, barva ozadja</translation>
+        <translation type="unfinished">Črtasto, barva ozadja</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Črtasto, barva gumba</translation>
+        <translation type="unfinished">Črtasto, barva gumba</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Transculentno črtasto, barva ozadja</translation>
+        <translation type="unfinished">Transculentno črtasto, barva ozadja</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Transculentno črtasto, barva gumba</translation>
+        <translation type="unfinished">Transculentno črtasto, barva gumba</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Nastavljena translucenca</translation>
+        <translation type="unfinished">Nastavljena translucenca</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Barva menujev</translation>
+        <translation type="unfinished">Barva menujev</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Barva besedila</translation>
+        <translation type="unfinished">Barva besedila</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Preliv</translation>
+        <translation type="unfinished">Preliv</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Uporabi senčeno besedilo v menujih</translation>
+        <translation type="unfinished">Uporabi senčeno besedilo v menujih</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Naj se orodni gumb pojavi ploščat</translation>
+        <translation type="unfinished">Naj se orodni gumb pojavi ploščat</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Črtast kontrast</translation>
+        <translation type="unfinished">Črtast kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>High Performance Liquid stil od Mosfeta</translation>
+        <translation type="unfinished">High Performance Liquid stil od Mosfeta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libmpeg3plugin.ts b/i18n/sl/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt_BR/libmpeg3plugin.ts
+++ b/i18n/sl/libmodplugin.ts
diff --git a/i18n/sl/libnetmonapplet.ts b/i18n/sl/libnetmonapplet.ts
deleted file mode 100644
index 48a91a4..0000000
--- a/i18n/sl/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation>Mreža ne deluje</translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation>Odklopi</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Priklopi</translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation>Mrežno geslo</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation>Priklopi</translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation>Vpišite geslo za %1:</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index cbf8e18..296b8f4 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -1,109 +1,659 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>Ponavljajoč dogodek
 </translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Vasak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Pogostost</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Konča na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi na</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>Tedenskaspremenljivka</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished">Brez končnega datuma</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished">Ponovi na</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">Pon</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">Tor</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">Sre</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">Čet</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">Pet</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">Sob</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">Ned</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation type="unfinished">Dan</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">Vsak</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izberi čas:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">Vsak</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libopieobex.ts b/i18n/sl/libopieobex.ts
index 98588c2..cb21255 100644
--- a/i18n/sl/libopieobex.ts
+++ b/i18n/sl/libopieobex.ts
@@ -1,124 +1,198 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ObexDlg</name>
     <message>
         <source>OBEX Sending</source>
         <translation type="obsolete">OBEX pošilja</translation>
     </message>
     <message>
         <source>Sending:</source>
         <translation type="obsolete">Pošiljam:</translation>
     </message>
     <message>
         <source>filename</source>
         <translation type="obsolete">Ime datoteke</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Prekliči</translation>
     </message>
 </context>
 <context>
     <name>ObexInc</name>
     <message>
         <source>OBEX Receiving</source>
         <translation type="obsolete">Obex sprejema</translation>
     </message>
     <message>
         <source>TextLabel1</source>
         <translation type="obsolete">TextLabel1</translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="obsolete">Ime datoteke</translation>
     </message>
     <message>
         <source>A file was beamed 
 to you.</source>
         <translation type="obsolete">Datoteka je bila prežarčena
 k vam.</translation>
     </message>
     <message>
         <source>Insert</source>
         <translation type="obsolete">Vstavi</translation>
     </message>
     <message>
         <source>Reject</source>
         <translation type="obsolete">Zavrni</translation>
     </message>
 </context>
 <context>
+    <name>OpieObex::OtherHandler</name>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished">Sprejmi</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished">Zavrni</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation type="unfinished">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
+    </message>
+</context>
+<context>
+    <name>OpieObex::SendWidget</name>
+    <message>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished">Končano</translation>
+    </message>
+    <message>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished">IrDa ni vklopljen!</translation>
+    </message>
+    <message>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished">Iščem IrDa naprave.</translation>
+    </message>
+    <message>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished">Bluetooth ni na voljo</translation>
+    </message>
+    <message>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished">Iščem bluetooth naprave.</translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished">Razvrščam za prežarčenje.</translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished">Klikni za prežarčenje</translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished">Poslano</translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished">Napaka</translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished">Probaj %1</translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished">Ponovno išči IrDa.</translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished">Začni pošiljati</translation>
+    </message>
+</context>
+<context>
     <name>OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation>Sprejmi</translation>
+        <translation type="obsolete">Sprejmi</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Zavrni</translation>
+        <translation type="obsolete">Zavrni</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation>&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
+        <translation type="obsolete">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
     </message>
 </context>
 <context>
     <name>SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation>Končano</translation>
+        <translation type="obsolete">Končano</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation>IrDa ni vklopljen!</translation>
+        <translation type="obsolete">IrDa ni vklopljen!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation>Iščem IrDa naprave.</translation>
+        <translation type="obsolete">Iščem IrDa naprave.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation>Bluetooth ni na voljo</translation>
+        <translation type="obsolete">Bluetooth ni na voljo</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation>Iščem bluetooth naprave.</translation>
+        <translation type="obsolete">Iščem bluetooth naprave.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation>Razvrščam za prežarčenje.</translation>
+        <translation type="obsolete">Razvrščam za prežarčenje.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation>Klikni za prežarčenje</translation>
+        <translation type="obsolete">Klikni za prežarčenje</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation>Poslano</translation>
+        <translation type="obsolete">Poslano</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation>Napaka</translation>
+        <translation type="obsolete">Napaka</translation>
     </message>
     <message>
         <source>Try %1</source>
-        <translation>Probaj %1</translation>
+        <translation type="obsolete">Probaj %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation>Ponovno išči IrDa.</translation>
+        <translation type="obsolete">Ponovno išči IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation>Začni pošiljati</translation>
+        <translation type="obsolete">Začni pošiljati</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 67daefa..44ea6b9 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -1,898 +1,990 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>(več.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Poslovno</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>Osebno</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>(Več.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>Nova kategorija</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>Nova kategorija</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>Uredi kategorijo</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>Kategorije</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>Aplikacija</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>Kategorije gredo sem</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Globalno</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>Obkljukajte kategorije katerim ta dokument pripada.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>Tu vnesite novo kategorijo. Pritisnite &lt;b&gt;Dodaj&lt;/b&gt;, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>Vnesite novo kategorijo levo in pritisnite dodaj, da dodate v seznam.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>Pritisnite, da izbrišete osvetljeno kategorijo.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>Obkljukajte, da naredite to lastnost dostopno vsem programom.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>Oprostite, že neka druga aplikacija
 ureja kategorije.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>Uredi kategorije</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>Prikaži januar v izbranem letu</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>Prikaži prejšni mesec</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>Prikaži naslednji mesec</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>Prikaži december v izbranem letu</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>Zapri Izbiralca datotek</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>Prikaži dokumente tega tipa</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>Prikaži dokumente v tej kategoriji</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>Obkljukajte, da izberete dokument iz seznama</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>ali pa izberite &lt;b&gt;Nov dokument&lt;/b&gt;, da ustvarite nov dokument.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;Kliknite in zadržite za lastnosti dokumenta.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>Ime</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Niz ni najden.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>Prišel na konec, začenjam na začetku</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>Najdi kaj:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>Začni iskati:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>Loči velike in male črke</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>Išči nazaj</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>Pogled dokumenta</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>Izbris datoteke spodletel.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>Kopija</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikat</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>Kopiranje datoteke spodletelo.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>Premikanje dokumenta spodletelo.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>Komentar:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>Hitro nalaganje (vzame nekaj spomin)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>Medij na katerem je dokument.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>Ime tega dokumenta.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>Prednaloži ta program tako, da je takoj na voljo.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>Izbriši ta dokument.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>Naredi kopijo tega dokumenta.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>Prežarči ta dokument na drugo napravo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>Uporabi prilagojen zasuk</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>Informacije o lastniku</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpiši geslo</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Prišlo je do problema pri ustvarjenju
 nastavitvene informacije
 za ta program.
 
 Prosim sprostite nekaj prostora in
 poizkusite ponovno.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Ne morem ustvariti zagonskih datotek
 Prosim sprostite nekaj prostora
 preden vnašate podatke</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Ne morem izvršiti alarma.
 Sprostite nekaj spomina in poizkusite ponovno.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>L</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>Ste prepričani, da želite izbrisati
+        <translation type="obsolete">Ste prepričani, da želite izbrisati
 %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Delovni naslov&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Domači naslov:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>Epoštni naslovi: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Domači telefon: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Domači faks: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Domači mobitel: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Domača spletna stran: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Službena spletna stran: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Pisarna: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Službeni telefon: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Službeni faks: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Službeni mobitel: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Službeni pager: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Poklic: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Pomočnik: </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Upravnik: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženska</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Spol: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Sopotnik: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>Rojstni dan: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>Obletnica: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>Vzdevek: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Imenski naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Naziv službenega mesta</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>Domači mobitel</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>Ulica službe</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>Mesto službe</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>Okrožje službe</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>Službena poštna številka</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>Država službe</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>Službeni pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>Službena spletna stran</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>Upravnik</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>Domač naslov</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>Domče mesto</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>Domača spletna stran</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>Sopotnik</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>Otroci</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Nov dokument</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
+    <message>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished">Kliknite tu, da naredite to okno premično.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
+    </message>
+    <message>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <translation type="unfinished">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+    </message>
+    <message>
+        <source>What&apos;s this...</source>
+        <translation type="unfinished">Kaj je to...</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+        <translation type="obsolete">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>Kaj je to...</translation>
+        <translation type="obsolete">Kaj je to...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation>Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation>Kliknite tu, da zaprete to okno.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation>Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
+        <translation type="obsolete">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Kliknite tu, da naredite to okno premično.</translation>
+        <translation type="obsolete">Kliknite tu, da naredite to okno premično.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation>Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
+        <translation type="obsolete">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Trdi disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kartica</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI trdi disk</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Notranja shramba</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Notranji spomin</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kartica</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>program citytime ni najden</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>Če želite izbrati časovni pas,
 prosim naložite citytime.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>Ne morem izvršiti alarma.
 Prosim sprostite malo prostora in poizkusite ponovno</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 datotek</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>Vseh %1 datotek</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>Vse datoteke</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libsdmonapplet.ts b/i18n/sl/libsdmonapplet.ts
deleted file mode 100644
index 7a0d003..0000000
--- a/i18n/sl/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation>Vstavi kartico</translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation>SdZaslon</translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation>Vstavitev kartice spodtletela!</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation>&amp;Vredu</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/libtodayaddressbookplugin.ts b/i18n/sl/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/sl/libtodayaddressbookplugin.ts
+++ b/i18n/sl/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libtodaydatebookplugin.ts b/i18n/sl/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/sl/libtodaydatebookplugin.ts
+++ b/i18n/sl/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libtodaytodolistplugin.ts b/i18n/sl/libtodaytodolistplugin.ts
index 5ca01fe..b423a53 100644
--- a/i18n/sl/libtodaytodolistplugin.ts
+++ b/i18n/sl/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/pt_BR/librestartapplet.ts b/i18n/sl/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/pt_BR/librestartapplet.ts
+++ b/i18n/sl/libtremorplugin.ts
diff --git a/i18n/sl/libwlan.ts b/i18n/sl/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/sl/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libwlanplugin.ts b/i18n/sl/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/sl/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/liquid-settings.ts b/i18n/sl/liquid-settings.ts
deleted file mode 100644
index 8721ed3..0000000
--- a/i18n/sl/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation>Stil Liquid</translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation>Brez transculence</translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation>Črtasto, barva ozadja</translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation>Črtasto. barva gumba</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation>Transculentno črtasto, barva ozadja</translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation>Transculentno črtasto, barva gumba</translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation>Barva menuja</translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation>Barva besedila</translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation>Uporabi osenčeno besedilo</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/mailit.ts b/i18n/sl/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/sl/mailit.ts
+++ b/i18n/sl/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/mediummount.ts b/i18n/sl/mediummount.ts
index 3187df3..b7335e1 100644
--- a/i18n/sl/mediummount.ts
+++ b/i18n/sl/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation>Globalno</translation>
-    </message>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Global</source>
+        <translation type="unfinished">Globalno</translation>
+    </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
-        <translation>Vklopi preverjanje medija</translation>
+        <translation type="unfinished">Vklopi preverjanje medija</translation>
     </message>
     <message>
         <source>Use global settings</source>
-        <translation>Uporabi globalne nastavitve</translation>
+        <translation type="unfinished">Uporabi globalne nastavitve</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Katere medijske datoteke</translation>
+        <translation type="unfinished">Katere medijske datoteke</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="unfinished">Audio</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Vse</translation>
+        <translation type="unfinished">Vse</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Slika</translation>
+        <translation type="unfinished">Slika</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Besedilo</translation>
+        <translation type="unfinished">Besedilo</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="unfinished">Video</translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
-        <translation>Katere medijske datoteke</translation>
+        <translation type="unfinished">Katere medijske datoteke</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="unfinished">Audio</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Vse</translation>
+        <translation type="unfinished">Vse</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Slika</translation>
+        <translation type="unfinished">Slika</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Besedilo</translation>
+        <translation type="unfinished">Besedilo</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="unfinished">Video</translation>
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation>Omeji iskanje na:</translation>
+        <translation type="unfinished">Omeji iskanje na:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Dodaj</translation>
+        <translation type="unfinished">Dodaj</translation>
     </message>
     <message>
         <source>Always check this medium</source>
-        <translation>Vedno preveri ta medij</translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Vedno preveri ta medij</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/mobilemsg.ts b/i18n/sl/mobilemsg.ts
deleted file mode 100644
index 9f5398c..0000000
--- a/i18n/sl/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation>Sporočila:</translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation>Mobilno sporočanje</translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation>Število:</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Pošlji</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>Besedilo</translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation>Flash</translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation>Unicode</translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation>Nokia</translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation>Država:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation>Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>Skupina</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation>Slika</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation>Sporočilo:</translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation>EMS</translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation>Zavihek</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/mpegplayer.ts b/i18n/sl/mpegplayer.ts
deleted file mode 100644
index e822f16..0000000
--- a/i18n/sl/mpegplayer.ts
+++ b/dev/null
@@ -1,229 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePredvajalnik</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation>Nobene datoteke</translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation>Napaka: Nobena datoteka ni izbrana</translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation>Ne najdem datoteke</translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation>Ne najdem datoteke: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation>Ne najdem nobenega dekodirnika</translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation>Oprostite, ne najdem primernega dekodirnika za to datoteko: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation>Napaka pri odpiranju datoteke</translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation>Oprostite, prišlo je do napake pri predvajanju datoteke: &lt;i&gt;</translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation>Datoteka: </translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>, Dolžina: </translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>Seznam predvajanja</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePredvajalnik</translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation>Operacije predvajanja</translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>Dodaj v predvajalni seznam</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>Odstrani iz seznama</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>Predvajaj</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>Zmešaj</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>Zanka</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Datoteka</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>Zbriši seznam</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>Dodaj vse avdio datoteke</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>Dodaj vse video datoteke</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>Dodaj vse datoteke</translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation>Shrani seznam</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>Pogled</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>Cel zaslon</translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation>Skala</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>Premakni gor</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>Premakni dol</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>Zmanjkalo prostora</translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation>Prišlo je do problema pr shranjevanju seznama.
-Seznam mogoče ne bo vseboval vseh vnosov,
-naslednjič, ko jo boste uporabili.</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>Neveljavna datoteka</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>Prišlo je do problema pri branju datotoke.</translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation>To je že v seznamu.
-Nadaljujem?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>Da</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>Ne</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>Odstranim seznam?</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>Res želite izbrisati
-ta seznam?</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>Predvajaj izbrano</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Naslov</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>Velikost</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>Medij</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>Video</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>Seznami</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>OpiePlayer: </translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>Shrani seznam</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Lastnosti</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>OpiePredvajalnik</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/netsetup.ts b/i18n/sl/netsetup.ts
deleted file mode 100644
index b806c45..0000000
--- a/i18n/sl/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation>Dodaj mrežni servis</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation>&lt;P&gt;To so mrežni servisi, ki so na voljo, da jih dodate.</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>Dodaj</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation>Napaka</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation>&lt;p&gt;Dodate lahko samo en %1. Odstranite trenutnega ali pa spremenite njegove lastnosti</translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation>Mreža</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation>Mreža</translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation>Trenuten</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation>&lt;p&gt;To je stanje vaših trenutnih mrežnih servisov.</translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation>Servisi</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Dodaj...</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation>&lt;P&gt;To so mrežni servisi, ki so vam trenutno na voljo.</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation>Lastnosti</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/networksettings.ts b/i18n/sl/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/sl/networksettings.ts
+++ b/i18n/sl/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/odict.ts b/i18n/sl/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/sl/odict.ts
+++ b/i18n/sl/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/oipkg.ts b/i18n/sl/oipkg.ts
deleted file mode 100644
index 1623f20..0000000
--- a/i18n/sl/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>Odstrani</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/opie-console.ts b/i18n/sl/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/sl/opie-console.ts
+++ b/i18n/sl/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opie-login.ts b/i18n/sl/opie-login.ts
index 42551e6..f4806d5 100644
--- a/i18n/sl/opie-login.ts
+++ b/i18n/sl/opie-login.ts
@@ -1,83 +1,83 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
+        <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failure</source>
+        <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not start OPIE.</source>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not switch to new user identity</source>
+        <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opie-sheet.ts b/i18n/sl/opie-sheet.ts
deleted file mode 100644
index 322b113..0000000
--- a/i18n/sl/opie-sheet.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/opieftp.ts b/i18n/sl/opieftp.ts
index c747251..193b136 100644
--- a/i18n/sl/opieftp.ts
+++ b/i18n/sl/opieftp.ts
@@ -1,240 +1,236 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>Povezava</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>Lokalen</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>Oddaljen</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>Poveži</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>Prekini</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>Prikaži skrite datoteke</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>Prenos od sebe</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>Ustvari imenik</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Preimenuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>Prenesi k sebi</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>Preklopi na nastavitve</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>Imenik</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>Uporabnik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Geslo</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>Oddaljeni strežnik</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>Oddaljena pot</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Vrata</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>Prosimo nastavite informacije o strežniku</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>Ne uspem se povezati na</translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>Ne uspem se prijaviti v</translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>Ne uspem prenesti od sebe</translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>Ne morem prenesti od sebe imenikov</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>Ne uspem prenesti k sebi</translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>Ne uspem dobiti seznama v imeniku</translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>Ne uspem zamenjati imenika</translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>Ne uspem dobiti delovnega imenika</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Zamenjaj imenik</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>Ali res želite izbrisati</translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation>?
 Mora biti prazen</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>Ne uspem ustvariti imenika</translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>Ne uspem odstraniti imenika</translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>Ne uspem izbrisati datoteke</translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>Ne uspem preimenovati datoteke</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ta imenik ne obstaja</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">O</translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation>Preglej</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opieirc.ts b/i18n/sl/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/sl/opieirc.ts
+++ b/i18n/sl/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opiemail.ts b/i18n/sl/opiemail.ts
deleted file mode 100644
index 6ac35bb..0000000
--- a/i18n/sl/opiemail.ts
+++ b/dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation>Odgovori</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation>Odgovori vsem</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Izbriši</translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation>Obrazec1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation>KP</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation>Zadeva</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>Prekliči</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation>Ponastavi</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation>Vrsta</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation>Pošlji</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation>Od:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation>Za:</translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation>Pogled</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation>Novo sporočilo</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>Pošta</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation>Poštni nabiralniki</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation>Nastavi OpiePošta</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation>OpiePošta nastavitve</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation>Mape</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Dodaj</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation>&amp;Spremeni</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Zbriši</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation>Ime mape</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation>Identiteta</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation>Prenos</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation>Vhod</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Ime</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation>Mapa</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation>Uporabnik</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation>Strežnik</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protokol</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation>Izhod</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation>Zbriši poštni nabiralnik</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation>Naj zbrišem poštni nabiralnik?
-Vsa pošta bo zbrisana.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation>OpiePošta nastavitev map</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation>Opis:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation>OpiePošta nastavitev identitete</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation>Podpis:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation>Identiteta:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation>Organizacija:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation>Epošta:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation>Odgovori</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation>Uporabi za pošiljanje</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation>OpiePoštaVhod</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Strežnik:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protokol</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation>Ciljna mapa</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uporabnik:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Geslo</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Vrata</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation>110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation>Uporabi intervalno preverjanje.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation>Preveri vsakih:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minut</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation>&amp;Izbriši pošto iz strežnika, ko zbrišeš lokalno.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation>&amp;Pusti pošto na strežniku</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation>OpiePoštaIzhod</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>Ime:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation>Protokol</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation>Strežnik:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uporabnik:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation>Geslo</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation>Strežnik potrebuje avtorizacijo</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation>Vrata</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation>25</translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation>Zadeva</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation>Za</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation>Pošiljatelj</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation>Datum</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation>Uredi</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation>Kopiraj v</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation>Premakni v</translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation>Obrazec1</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/opieplayer.ts b/i18n/sl/opieplayer.ts
index 1a7c3b8..984cdce 100644
--- a/i18n/sl/opieplayer.ts
+++ b/i18n/sl/opieplayer.ts
@@ -1,276 +1,276 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>Nekaj je narobe z
 vašo zvočno napravo.
 open(&quot;/dev/dsp&quot;)
 </translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 Zapiram predvajalnik.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Prekini</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>Ni datoteke</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>Napaka: Nobena datoteka ni izbrana</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>Ne najdem datoteke</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>Ta datoteka ni bila najdena: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>Ne najdem dekodirnika</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>Oprostite, ni primernega dekodirnika za to datoteko: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>Napak pri odpiranju datoteke</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>Oprostite, pojavila se je napaka pri poizkusu predvajanja te datoteke: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>Datoteka:</translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, dolžina:</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>Izbor predvajalnega seznama</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>Operacije predvajanja</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>Dodaj v seznam</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>Odstrani iz seznama</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Predvajaj</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>Zmešaj</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>V krogu</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>Zbriši seznam</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>Dodaj vse audio datoteke</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>Dodaj vse video datoteke</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Dodaj vse datoteke</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>Shrani seznam</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>Odpri datoteko ali URL</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>Preglej za audio datoteke</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Preglej za video datoteke</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Celoten zaslon</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Skala</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Premakni gor</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstrani</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Premakni dol</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Medij</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Seznami</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>OpiePlayer: </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Zmanjkalo prostora</translation>
+        <translation type="obsolete">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>Prišlo je do problema pri shranjevanju seznama.
+        <translation type="obsolete">Prišlo je do problema pri shranjevanju seznama.
 Vaš seznam bo mogoče drugačen
 naslednjič, ko poženete program.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Neveljavna datoteka</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Prišlo je do problema pri pobiranju datoteke.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>Odstrani seznam?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>Ali res želite izbrisati
 ta seznam?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Lastnosti</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Predvajaj izbrane</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Odpri datoteko ali URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Shrani m3u seznam</translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>OpiePlayer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/opieplayer2.ts b/i18n/sl/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/sl/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/opierec.ts b/i18n/sl/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/sl/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/osearch.ts b/i18n/sl/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/sl/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/patience.ts b/i18n/sl/patience.ts
index 1c91129..ecc3a09 100644
--- a/i18n/sl/patience.ts
+++ b/i18n/sl/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Pasjansa</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Igra</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;Zamenjaj zadnjo stran kart</translation>
+        <translation type="obsolete">&amp;Zamenjaj zadnjo stran kart</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>Z&amp;askoči na položaj</translation>
+        <translation type="obsolete">Z&amp;askoči na položaj</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavitve</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Igraj</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>Zamenjaj zadnje strani kart</translation>
+        <translation type="obsolete">Zamenjaj zadnje strani kart</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>Zaskoči na položaj</translation>
+        <translation type="obsolete">Zaskoči na položaj</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>Obrni eno karto</translation>
+        <translation type="obsolete">Obrni eno karto</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>Obrni tri karte</translation>
+        <translation type="obsolete">Obrni tri karte</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/qpdf.ts b/i18n/sl/qpdf.ts
index 526cd95..0267938 100644
--- a/i18n/sl/qpdf.ts
+++ b/i18n/sl/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>Povečava</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>Povečaj do širine</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>Povečaj do strani</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>Odpri...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Najdi...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>Celoten zaslon</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>Prva stran</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>Prejšna stran</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>Pojdi na stran...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>Naslednja stran</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>Zadnja stran</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Naslednja</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>Pojdi na stran</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>Izberi iz 1 ..%1:</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>&apos;%1&apos; ni najdena.</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>Datoteka ne obstaja !</translation>
+        <translation type="obsolete">Datoteka ne obstaja !</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index ca0ffaf..15ab396 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Prekliči</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/reader.ts b/i18n/sl/reader.ts
index 3842246..8ecd776 100644
--- a/i18n/sl/reader.ts
+++ b/i18n/sl/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/rotation.ts b/i18n/sl/rotation.ts
deleted file mode 100644
index 1c6ec72..0000000
--- a/i18n/sl/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>Nastavitve rotacije</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>&lt;p&gt;Izberite orientacijo iz opcij levo.</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>Avtomatično ponovno zaženi Opie?</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>&lt;p&gt;Rotacija ni vklopljena v tej demo verziji, kakorkoli to je podprto v Qt/Embedded.</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index e817117..986bb8d 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -1,106 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nastavi kodo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpišite kodo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koda ni pravilna</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vpisana koda ni pravilna.
 Dostop zavrnjen</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation type="unfinished">1.0.0.0/8</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/snake.ts b/i18n/sl/snake.ts
index 502c1e0..6eae0c1 100644
--- a/i18n/sl/snake.ts
+++ b/i18n/sl/snake.ts
@@ -1,43 +1,51 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Kača</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Nova igra</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>KAČA!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Uporabite smerne tipke za vodenje
 kače, da poje miš. Ne smete se
 zabiti v steno, robove ali svoj rep.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>Pritisnite karkoli za začetek</translation>
+        <translation type="obsolete">Pritisnite karkoli za začetek</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>    Točke:    %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>KONEC IGRE!
 Vaše točke: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation>Pritisnite karkoli za začetek nove igre.</translation>
+        <translation type="obsolete">Pritisnite karkoli za začetek nove igre.</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/spreadsheet.ts b/i18n/sl/spreadsheet.ts
deleted file mode 100644
index e82a03c..0000000
--- a/i18n/sl/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation>Razpredelnica</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>Nova</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Odpri</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zapri</translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation>Formula</translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation>Zbriši celico</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>Datoteka</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>Uredi</translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation>RazpredelnicaWidget</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/stockticker.ts b/i18n/sl/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/sl/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/sysinfo.ts b/i18n/sl/sysinfo.ts
index f0f6056..8e3397f 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -1,302 +1,276 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uporaba CPE v aplikacijah (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uporaba CPE v sistemu (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Medpomnilniki (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Predpomneno (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Prosto (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Skupen spomin: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uporabi#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>Uporablja ga</translation>
+        <translation type="obsolete">Uporablja ga</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to execute
-</source>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>Na voljo (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Ukaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <source>You really want to send %1 to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacija o sistemu</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Spomin</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Pomnilnik</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPE</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Različica</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux jedro&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Prevedel: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zgrajeno na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/systemtime.ts b/i18n/sl/systemtime.ts
index 8b43d60..4e5a4fa 100644
--- a/i18n/sl/systemtime.ts
+++ b/i18n/sl/systemtime.ts
@@ -1,324 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation type="unfinished">Oblika časa</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation type="unfinished">uu:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation type="unfinished">D/M uu:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation type="unfinished">M/D hh:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation type="unfinished">12/24 ur</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation type="unfinished">24 ur</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation type="unfinished">12 ur</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation type="unfinished">Oblika datuma</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation type="unfinished">Teden se začne na</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished">Nedeljo</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished">Ponedeljek</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>n/a</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> s/h</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Časovni pas</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Oblika časa</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24 ur</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12 ur</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Teden se začne na</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Nedeljo</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Ponedeljek</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Oblika datuma</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Oblika programčka</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">uu:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">D/M uu:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/D hh:mm</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Ura</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minute</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation type="unfinished">Ura</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished">Minute</translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished">AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished">Datum</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/tetrix.ts b/i18n/sl/tetrix.ts
index af0cc4f..315fa83 100644
--- a/i18n/sl/tetrix.ts
+++ b/i18n/sl/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished">Nivo</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>Naslednji</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>Točke</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>Nivo</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>Odstranjen</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/textedit.ts b/i18n/sl/textedit.ts
index 4009a56..751bb8b 100644
--- a/i18n/sl/textedit.ts
+++ b/i18n/sl/textedit.ts
@@ -1,264 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Odpri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>Shrani kot</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>Izreži</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>Najdi...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>Povečaj</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>Pomanjšaj</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>Objami vrstice</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>Začni z novo datoteko</translation>
     </message>
     <message>
         <source>File</source>
         <translation>Datoteka</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Najdi naslednjega</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Zapri Najdi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>Urejevalnik besedila</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>.desktop datoteka</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Povezan dokument</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>Besedilo</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation type="unfinished">Neimenovano</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished">Pravice</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished">Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">Ne</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>Lastnik</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>read</source>
         <translation>beri</translation>
     </message>
     <message>
         <source>write</source>
         <translation>piši</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>izvrši</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>Opozorilo</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>Napaka- ni uporabnika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>Napaka- ni skupine</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>Napaka pri nastavitvi lastništva ali skupine</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>Napaka pri nastavitvi načina</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/tictac.ts b/i18n/sl/tictac.ts
index 096d036..d809cc5 100644
--- a/i18n/sl/tictac.ts
+++ b/i18n/sl/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Začne računalnik</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Začne človek</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Igraj!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pritisni Igraj za začetek</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Vi ste na potezi</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Zmagali ste!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Zmagal je računalnik!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Neodločeno</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/tinykate.ts b/i18n/sl/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/sl/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index 9d95b1b..b8a4f9f 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,117 +1,138 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>Owned by </source>
-        <translation>Lastnik je</translation>
+        <translation type="unfinished">Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Danes</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation type="unfinished">Nastavitve Danes</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>active/order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
+        <source>Misc</source>
+        <translation type="unfinished">Različno</translation>
+    </message>
+    <message>
+        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>minutes inactive</source>
+        <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
     <message>
-        <source>Misc</source>
-        <translation type="unfinished">Različno</translation>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon size</source>
+        <source>minutes inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the icon size in pixel</source>
+        <source> pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>Set the icon size in pixel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How often should Today refresh itself</source>
+        <source>icon size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>refresh</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/todaydatebookpluginconfig.ts b/i18n/sl/todaydatebookpluginconfig.ts
deleted file mode 100644
index e392d58..0000000
--- a/i18n/sl/todaydatebookpluginconfig.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 66fea41..f60ce01 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,560 +1,590 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
-        <translation>Alarmi</translation>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>Opozorilniki</translation>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Alarms</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informacija</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
-        <translation>Status</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurrence</source>
-        <translation>Ponavljanje</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
-        <translation>Vnesi opravilo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Uredi opravilo</translation>
+        <translation type="unfinished">Uredi opravilo</translation>
+    </message>
+    <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation>Nov iz predloge</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation>Novo opravilo</translation>
+        <translation type="unfinished">Novo opravilo</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation>Kliknite tu, da ustvarite novo opravilo.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation>Uredi opravilo</translation>
+        <translation type="unfinished">Uredi opravilo</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation>Kliknite tu, da spremenite trenutno opravilo.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation>Poglej opravila</translation>
+        <translation type="unfinished">Poglej opravila</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>Izbriši...</translation>
+        <translation type="unfinished">Izbriši...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation>Kliknite tu, da odstranite trenutno opravilo.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>Izbriši vse...</translation>
+        <translation type="unfinished">Izbriši vse...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>Izbris končan</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Prežarči</translation>
+        <translation type="unfinished">Prežarči</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation>Kliknite tu, da pošljete trenutno opravilo drugi napravi.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Najdi</translation>
+        <translation type="unfinished">Najdi</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation>Prikaži končana opravila</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation>Prikaži samo opravila, ki jim je rok pretekel</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation>Prikaži roke opravil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>Podatki</translation>
+        <translation type="unfinished">Podatki</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorija</translation>
+        <translation type="unfinished">Kategorija</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>Izbire</translation>
+        <translation type="unfinished">Izbire</translation>
     </message>
     <message>
         <source>QuickEdit</source>
-        <translation>Hitri urejevalnik</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>Vse kategorije</translation>
+        <translation type="unfinished">Vse kategorije</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Zmanjkalo prostora</translation>
+        <translation type="unfinished">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>Ne uspem
+        <translation type="unfinished">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation>Opravki</translation>
+        <translation type="unfinished">Opravki</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
+        <translation type="obsolete">Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Neizpolnjeno</translation>
+        <translation type="unfinished">Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>Podvoji</translation>
+        <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>C.</source>
-        <translation>K.</translation>
+        <translation type="unfinished">K.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Opis</translation>
+        <translation type="unfinished">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation>Rok</translation>
+        <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Complete </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work on </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organize </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plan </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Call </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Enter any additional information about this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information about this task here.</source>
+        <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Todo List</source>
+        <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>40 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>60 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>80 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>100 %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>test</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/sl/ubrowser.ts b/i18n/sl/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/sl/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/usermanager.ts b/i18n/sl/usermanager.ts
index f156e10..28f3895 100644
--- a/i18n/sl/usermanager.ts
+++ b/i18n/sl/usermanager.ts
@@ -1,31 +1,31 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
-        <translation>Dodaj skupino</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Group</source>
-        <translation>Uredi skupino</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation>OPIE upravljalnik uporabnikov</translation>
+        <source>Opie User Manager</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
-        <translation>Dodaj uporabnika</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit User</source>
-        <translation>Uredi uporabnika</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/wellenreiter.ts b/i18n/sl/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/sl/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/sl/wlansetup.ts b/i18n/sl/wlansetup.ts
deleted file mode 100644
index f092e39..0000000
--- a/i18n/sl/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation>Brežične LAN nastavitve</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation>ESS ID</translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation>Ne-Spec ESSID: &quot;KATERIKOLI&quot;</translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation>Specifičen ESSID</translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation>Tip mreže</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation>Infrastuktura</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Kanal</translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation>802.11 Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation>Wep</translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation>Nastavitve tipk</translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation>Tipka 1</translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation>Tipka 2</translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation>Tipka 3</translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation>Tipka 4</translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation>Dolžina tipke</translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation>40 bitov</translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation>128 bitov</translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation>Tip avtorizacije</translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation>Odprt sistem</translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation>Vklopi Wep</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/status_individual.sh b/i18n/status_individual.sh
index 349767d..0cbaae3 100755
--- a/i18n/status_individual.sh
+++ b/i18n/status_individual.sh
@@ -1,22 +1,40 @@
 #!/bin/sh
 #
 # Main
 #
 arg=$1
 if [ "x${arg}x" = "xx" ]; then
 	echo "Usage: ./status_indiviual XX"
 	echo "       with XX as a languagecode"
 	exit
 fi
 
 if [ "${arg}" = "todo" ]; then
 	if [ "x$2"x = "xx" ]; then
 		echo "missing second argument"
 		exit
 	fi
-	for i in $2/*.ts; do echo $i - `grep translation "$i" | grep type=\"unfinished\" | wc -l` | grep -v ' 0' ; done
+	for i in $2/*.ts; do 
+		echo $i - `grep translation "$i" | grep type=\"unfinished\" | wc -l` | grep -v ' 0' ; 
+	done
 	exit
 fi
 
+if [ "${arg}" = "overview" ]; then
+	if [ "x$2"x = "xx" ]; then
+		echo "missing second argument"
+		exit
+	fi
+
+	strs=`find $2 -path './unmaintained' -prune -o -path './en' -prune -o -path './xx' -prune -o -name "*.ts" -exec grep 'translation' {} \; | wc -l`
+	unfi=`find $2 -path './unmaintained' -prune -o -path './en' -prune -o -path './xx' -prune -o -name "*.ts" -exec grep 'type=\"unfinished\"' {} \; | wc -l`
+	obso=`find $2 -path './unmaintained' -prune -o -path './en' -prune -o -path './xx' -prune -o -name "*.ts" -exec grep 'type=\"obsolete\"' {} \; | wc -l`
+	printf "\n%12s %5s\n" "Total:" ${strs}
+	printf "%12s %5s %s\n" "Unfinished:" ${unfi} "[`expr \( ${strs} - ${unfi} \) \* 100 / ${strs}`% done]"
+	printf "%12s %5s %s\n\n" "Obsolete:" ${obso} "[`expr ${obso} \* 100 / ${strs}`%]"
+	exit
+fi
+	
+
 for i in $1/*.ts; do echo $i - `grep translation "$i" | grep type=\"unfinished\" | wc -l` ; done
 
diff --git a/i18n/unmaintained/hu/.cvsignore b/i18n/unmaintained/hu/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/unmaintained/hu/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/unmaintained/hu/.desktop b/i18n/unmaintained/hu/.desktop
deleted file mode 100644
index 7f16e9a..0000000
--- a/i18n/unmaintained/hu/.desktop
+++ b/dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Hungarian
-Name[de]=Ungarnish
-Name[hu]=Magyar
diff --git a/i18n/unmaintained/hu/.directory b/i18n/unmaintained/hu/.directory
deleted file mode 100644
index f63d1b1..0000000
--- a/i18n/unmaintained/hu/.directory
+++ b/dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Hungarian
-Name[pt]=Hngaro
-Name[pt_BR]=Hngaro
-Name[it]=Ungherese
-Name[sl]=Madzarscina
-Name[es]=Húngaro
-Name[da]=Ungarnsk
diff --git a/i18n/unmaintained/ja/.cvsignore b/i18n/unmaintained/ja/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/unmaintained/ja/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/unmaintained/ja/.directory b/i18n/unmaintained/ja/.directory
deleted file mode 100644
index 26b172d..0000000
--- a/i18n/unmaintained/ja/.directory
+++ b/dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Japanese
-Name[no]=Japansk
-Name[de]=Japanisch
-Name[ja]=日本語
-Name[hu]=Japán
-Name[pt]=Japonês
-Name[pt_BR]=Japonês
-Name[es]=Japonés
-Name[it]=Giapponese
-Name[sl]=Japonscina
-Name[da]=Japansk
diff --git a/i18n/unmaintained/ja/addressbook.ts b/i18n/unmaintained/ja/addressbook.ts
deleted file mode 100644
index 07e577f..0000000
--- a/i18n/unmaintained/ja/addressbook.ts
+++ b/dev/null
@@ -1,1392 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AbTable</name>
-    <message>
-        <source>Full Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pick</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts - My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
-    <message>
-        <source>Query Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notice: QT-Mail is just 
-provided in the SHARP 
-default ROM. Opie-Mail 
-is provided free !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactEditor</name>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>France</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Albania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Algeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>American Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Andorra</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Angola</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anguilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argentina</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aruba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Australia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Austria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahamas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahrain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barbados</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belarus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Benin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bermuda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bhutan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Botswana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brazil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burundi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cambodia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>China</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colombia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comoros</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cook Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Croatia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cuba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyprus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Denmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Djibouti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>East Timor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ecuador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Egypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>El Salvador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eritrea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fiji</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Guiana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gabon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Georgia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greece</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greenland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Grenada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guatemala</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guyana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Haiti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holy See</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Honduras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hungary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iceland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>India</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indonesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ireland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Israel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jordan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kenya</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Korea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Laos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Latvia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lebanon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lesotho</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liberia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithuania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macedonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Madagascar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malawi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malaysia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maldives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mali</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Martinique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mayotte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mexico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micronesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moldova</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monaco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mongolia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Montserrat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Morocco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mozambique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Myanmar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Namibia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nauru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nepal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Netherlands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Zealand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nigeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oman</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pakistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panama</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paraguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Philippines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Poland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portugal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reunion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Romania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Russia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rwanda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>San Marino</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Senegal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seychelles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Singapore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovakia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Somalia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>South Africa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>St. Helena</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sudan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suriname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Swaziland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sweden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switzerland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taiwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tanzania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thailand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Togo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tokelau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tonga</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunisia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uganda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ukraine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uruguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Venezuela</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yemen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/advancedfm.ts b/i18n/unmaintained/ja/advancedfm.ts
deleted file mode 100644
index 070ddfe..0000000
--- a/i18n/unmaintained/ja/advancedfm.ts
+++ b/dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedFm</name>
-    <message>
-        <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</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>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Output</name>
-    <message>
-        <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/appearance.ts b/i18n/unmaintained/ja/appearance.ts
deleted file mode 100644
index 6b7db2b..0000000
--- a/i18n/unmaintained/ja/appearance.ts
+++ b/dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Appearance</name>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete current scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
-
-Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure the currently selected style.
-
-Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Window decorations control the way the application title bar and its buttons appear.
-
-Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color schemes are a collection of colors which are used for various parts of the display.
-
-Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
-
-1. Tabs - normal tabs with text labels only
-2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
-3. Drop down list - a vertical listing of tabs
-4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleWindow</name>
-    <message>
-        <source>Sample</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/appskey.ts b/i18n/unmaintained/ja/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/unmaintained/ja/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/backup.ts b/i18n/unmaintained/ja/backup.ts
deleted file mode 100644
index 02b6cc2..0000000
--- a/i18n/unmaintained/ja/backup.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BackupAndRestore</name>
-    <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
-    <message>
-        <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/bounce.ts b/i18n/unmaintained/ja/bounce.ts
deleted file mode 100644
index 9d2d3d1..0000000
--- a/i18n/unmaintained/ja/bounce.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KJezzball</name>
-    <message>
-        <source>Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game paused.
-Press P to continue!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over!
-Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully cleared more than 75%.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: 15 points per life
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Bonus
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Total score
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On to level %1.
-You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/buzzword.ts b/i18n/unmaintained/ja/buzzword.ts
deleted file mode 100644
index 076f679..0000000
--- a/i18n/unmaintained/ja/buzzword.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BuzzWord</name>
-    <message>
-        <source>buZzword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/calculator.ts b/i18n/unmaintained/ja/calculator.ts
deleted file mode 100644
index edd7e16..0000000
--- a/i18n/unmaintained/ja/calculator.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calculator</name>
-    <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ln</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>tan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+/-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CalculatorImpl</name>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/checkbook.ts b/i18n/unmaintained/ja/checkbook.ts
deleted file mode 100644
index 77b4422..0000000
--- a/i18n/unmaintained/ja/checkbook.ts
+++ b/dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Checkbook</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transactions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIN number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all transactions entered for this checkbook.
-
-To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password protect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Num</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Configuration</name>
-    <message>
-        <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show whether checkbook is password
-protected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new checkbook.
-
-You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to edit it.
-
-You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here delete it.
-
-You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Transaction</name>
-    <message>
-        <source>Transaction for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction type here.
-
-The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/citytime.ts b/i18n/unmaintained/ja/citytime.ts
deleted file mode 100644
index a250baf..0000000
--- a/i18n/unmaintained/ja/citytime.ts
+++ b/dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CityTime</name>
-    <message>
-        <source>Time Changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting timezone %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CityTimeBase</name>
-    <message>
-        <source>City Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ZoneMap</name>
-    <message>
-        <source>CITY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to Find Timezone Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/clock.ts b/i18n/unmaintained/ja/clock.ts
deleted file mode 100644
index d4a93dc..0000000
--- a/i18n/unmaintained/ja/clock.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Clock</name>
-    <message>
-        <source>Snooze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/confedit.ts b/i18n/unmaintained/ja/confedit.ts
deleted file mode 100644
index a4f440a..0000000
--- a/i18n/unmaintained/ja/confedit.ts
+++ b/dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>EditWidget</name>
-    <message>
-        <source>File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewConfDir</name>
-    <message>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewItemConfFile</name>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>no group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/datebook.ts b/i18n/unmaintained/ja/datebook.ts
deleted file mode 100644
index 621fcc7..0000000
--- a/i18n/unmaintained/ja/datebook.ts
+++ b/dev/null
@@ -1,741 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time (dayview)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>W: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/drawpad.ts b/i18n/unmaintained/ja/drawpad.ts
deleted file mode 100644
index d8b80c5..0000000
--- a/i18n/unmaintained/ja/drawpad.ts
+++ b/dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/embeddedkonsole.ts b/i18n/unmaintained/ja/embeddedkonsole.ts
deleted file mode 100644
index 81b9d45..0000000
--- a/i18n/unmaintained/ja/embeddedkonsole.ts
+++ b/dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CommandEditDialog</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommandEditDialogBase</name>
-    <message>
-        <source>Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Konsole</name>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Yellow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Magenta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magenta on Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyan on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Cyan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amber on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ScrollBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Beep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>editCommandBase</name>
-    <message>
-        <source>Add command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter command to add:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/fifteen.ts b/i18n/unmaintained/ja/fifteen.ts
deleted file mode 100644
index b52d689..0000000
--- a/i18n/unmaintained/ja/fifteen.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FifteenMainWindow</name>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PiecesTable</name>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulations!
-You win the game!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;andomize Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reset Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/filebrowser.ts b/i18n/unmaintained/ja/filebrowser.ts
deleted file mode 100644
index aff9a16..0000000
--- a/i18n/unmaintained/ja/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/formatter.ts b/i18n/unmaintained/ja/formatter.ts
deleted file mode 100644
index 751e732..0000000
--- a/i18n/unmaintained/ja/formatter.ts
+++ b/dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatterApp</name>
-    <message>
-        <source>Formatter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mount Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really format
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not format.
-Unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>umount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not umount.
-Device is busy!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such device!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/go.ts b/i18n/unmaintained/ja/go.ts
deleted file mode 100644
index 07e1e03..0000000
--- a/i18n/unmaintained/ja/go.ts
+++ b/dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GoMainWidget</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resign</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two player option</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>GoWidget</name>
-    <message>
-        <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A draw.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/helpbrowser.ts b/i18n/unmaintained/ja/helpbrowser.ts
deleted file mode 100644
index 4951556..0000000
--- a/i18n/unmaintained/ja/helpbrowser.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <source>Backward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HelpBrowser</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/kbill.ts b/i18n/unmaintained/ja/kbill.ts
deleted file mode 100644
index 10b6638..0000000
--- a/i18n/unmaintained/ja/kbill.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KBill</name>
-    <message>
-        <source>kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UI</name>
-    <message>
-        <source>After Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your score</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/kcheckers.ts b/i18n/unmaintained/ja/kcheckers.ts
deleted file mode 100644
index 01e6872..0000000
--- a/i18n/unmaintained/ja/kcheckers.ts
+++ b/dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KCheckers</name>
-    <message>
-        <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> New Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Undo Move </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/keypebble.ts b/i18n/unmaintained/ja/keypebble.ts
deleted file mode 100644
index 3da72e1..0000000
--- a/i18n/unmaintained/ja/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/kpacman.ts b/i18n/unmaintained/ja/kpacman.ts
deleted file mode 100644
index fb73268..0000000
--- a/i18n/unmaintained/ja/kpacman.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keys</name>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Kpacman</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@PACKAGE@ - @VERSION@
-
-Joerg Thoennissen (joe@dsite.de)
-
-A pacman game for the KDE Desktop
-
-The program based on the source of ksnake
-by Michel Filippi (mfilippi@sade.rhein-main.de).
-The design was strongly influenced by the pacman
-(c) 1980 MIDWAY MFG.CO.
-
-I like to thank my girlfriend Elke Krueers for
-the last 10 years of her friendship.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KpacmanWidget</name>
-    <message>
-        <source>The bitfont could not be contructed.
-
-The file &apos;@FONTNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Referee</name>
-    <message>
-        <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>READY!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-POKEY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Score</name>
-    <message>
-        <source>  1UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  2UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Status</name>
-    <message>
-        <source>The pixmap could not be contructed.
-
-The file &apos;@PIXMAPNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/language.ts b/i18n/unmaintained/ja/language.ts
deleted file mode 100644
index 24fd93b..0000000
--- a/i18n/unmaintained/ja/language.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LanguageSettings</name>
-    <message>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>default</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageSettingsBase</name>
-    <message>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select language</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libbatteryapplet-ipaq.ts b/i18n/unmaintained/ja/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/unmaintained/ja/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libbatteryapplet.ts b/i18n/unmaintained/ja/libbatteryapplet.ts
deleted file mode 100644
index 0f0c5ce..0000000
--- a/i18n/unmaintained/ja/libbatteryapplet.ts
+++ b/dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libcardmonapplet.ts b/i18n/unmaintained/ja/libcardmonapplet.ts
deleted file mode 100644
index 441a701..0000000
--- a/i18n/unmaintained/ja/libcardmonapplet.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CardMonitor</name>
-    <message>
-        <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libclipboardapplet.ts b/i18n/unmaintained/ja/libclipboardapplet.ts
deleted file mode 100644
index 9b0ac97..0000000
--- a/i18n/unmaintained/ja/libclipboardapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ClipboardApplet</name>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libdialup.ts b/i18n/unmaintained/ja/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/unmaintained/ja/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libhomeapplet.ts b/i18n/unmaintained/ja/libhomeapplet.ts
deleted file mode 100644
index 35433b8..0000000
--- a/i18n/unmaintained/ja/libhomeapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HomeApplet</name>
-    <message>
-        <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libirdaapplet.ts b/i18n/unmaintained/ja/libirdaapplet.ts
deleted file mode 100644
index 1000064..0000000
--- a/i18n/unmaintained/ja/libirdaapplet.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IrdaApplet</name>
-    <message>
-        <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Found:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lost:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/liblan.ts b/i18n/unmaintained/ja/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/unmaintained/ja/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libliquid.ts b/i18n/unmaintained/ja/libliquid.ts
deleted file mode 100644
index 410b29e..0000000
--- a/i18n/unmaintained/ja/libliquid.ts
+++ b/dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSettings</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/liblogoutapplet.ts b/i18n/unmaintained/ja/liblogoutapplet.ts
deleted file mode 100644
index 06cbe25..0000000
--- a/i18n/unmaintained/ja/liblogoutapplet.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LogoutApplet</name>
-    <message>
-        <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to
-end this session ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libmadplugin.ts b/i18n/unmaintained/ja/libmadplugin.ts
deleted file mode 100644
index 775b417..0000000
--- a/i18n/unmaintained/ja/libmadplugin.ts
+++ b/dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LibMadPlugin</name>
-    <message>
-        <source>No Song Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Track: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Genre: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bitrate: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libmetal.ts b/i18n/unmaintained/ja/libmetal.ts
deleted file mode 100644
index b82c564..0000000
--- a/i18n/unmaintained/ja/libmetal.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Metal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libnetmonapplet.ts b/i18n/unmaintained/ja/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/unmaintained/ja/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libopie.ts b/i18n/unmaintained/ja/libopie.ts
deleted file mode 100644
index cbaa47b..0000000
--- a/i18n/unmaintained/ja/libopie.ts
+++ b/dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ORecurranceBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>TimePicker</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>
-</TS>
diff --git a/i18n/unmaintained/ja/libopieobex.ts b/i18n/unmaintained/ja/libopieobex.ts
deleted file mode 100644
index 99d06ec..0000000
--- a/i18n/unmaintained/ja/libopieobex.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqdvorak.ts b/i18n/unmaintained/ja/libqdvorak.ts
deleted file mode 100644
index 5e1ab53..0000000
--- a/i18n/unmaintained/ja/libqdvorak.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqhandwriting.ts b/i18n/unmaintained/ja/libqhandwriting.ts
deleted file mode 100644
index 20ed59b..0000000
--- a/i18n/unmaintained/ja/libqhandwriting.ts
+++ b/dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HandwritingHelp</name>
-    <message>
-        <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HandwritingTrainer</name>
-    <message>
-        <source>Matched: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Similar to: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No match</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenEdit</name>
-    <message>
-        <source>New...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInput</name>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInputCharDlg</name>
-    <message>
-        <source>Enter new character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenPrefBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenSetup</name>
-    <message>
-        <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Customize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqjumpx.ts b/i18n/unmaintained/ja/libqjumpx.ts
deleted file mode 100644
index 80ea414..0000000
--- a/i18n/unmaintained/ja/libqjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqkeyboard.ts b/i18n/unmaintained/ja/libqkeyboard.ts
deleted file mode 100644
index 318758e..0000000
--- a/i18n/unmaintained/ja/libqkeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqkjumpx.ts b/i18n/unmaintained/ja/libqkjumpx.ts
deleted file mode 100644
index 964d5dc..0000000
--- a/i18n/unmaintained/ja/libqkjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqmultikey.ts b/i18n/unmaintained/ja/libqmultikey.ts
deleted file mode 100644
index d1d7b71..0000000
--- a/i18n/unmaintained/ja/libqmultikey.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Multikey Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keymap File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Pressed Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Multikey</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqpe.ts b/i18n/unmaintained/ja/libqpe.ts
deleted file mode 100644
index 4421779..0000000
--- a/i18n/unmaintained/ja/libqpe.ts
+++ b/dev/null
@@ -1,890 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</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>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libqpickboard.ts b/i18n/unmaintained/ja/libqpickboard.ts
deleted file mode 100644
index 488fb8f..0000000
--- a/i18n/unmaintained/ja/libqpickboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libscreenshotapplet.ts b/i18n/unmaintained/ja/libscreenshotapplet.ts
deleted file mode 100644
index 057c267..0000000
--- a/i18n/unmaintained/ja/libscreenshotapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ScreenshotControl</name>
-    <message>
-        <source>Snapshot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>scap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libsdmonapplet.ts b/i18n/unmaintained/ja/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/unmaintained/ja/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/libvolumeapplet.ts b/i18n/unmaintained/ja/libvolumeapplet.ts
deleted file mode 100644
index fbb6fb9..0000000
--- a/i18n/unmaintained/ja/libvolumeapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VolumeControl</name>
-    <message>
-        <source>Enable Sounds for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Clicks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Taps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/light-and-power.ts b/i18n/unmaintained/ja/light-and-power.ts
deleted file mode 100644
index 0deb0b7..0000000
--- a/i18n/unmaintained/ja/light-and-power.ts
+++ b/dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibration</name>
-    <message>
-        <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LightSettingsBase</name>
-    <message>
-        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dim light after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light off after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on Battery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on AC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warnings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SensorBase</name>
-    <message>
-        <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/liquid-settings.ts b/i18n/unmaintained/ja/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/unmaintained/ja/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/mediummount.ts b/i18n/unmaintained/ja/mediummount.ts
deleted file mode 100644
index dba8eda..0000000
--- a/i18n/unmaintained/ja/mediummount.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/mindbreaker.ts b/i18n/unmaintained/ja/mindbreaker.ts
deleted file mode 100644
index 598d561..0000000
--- a/i18n/unmaintained/ja/mindbreaker.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MindBreaker</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MindBreakerBoard</name>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/minesweep.ts b/i18n/unmaintained/ja/minesweep.ts
deleted file mode 100644
index 1dd7e7f..0000000
--- a/i18n/unmaintained/ja/minesweep.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MineSweep</name>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You exploded!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/mobilemsg.ts b/i18n/unmaintained/ja/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/unmaintained/ja/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/mpegplayer.ts b/i18n/unmaintained/ja/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/unmaintained/ja/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/netsetup.ts b/i18n/unmaintained/ja/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/unmaintained/ja/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/oipkg.ts b/i18n/unmaintained/ja/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/unmaintained/ja/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/opie-login.ts b/i18n/unmaintained/ja/opie-login.ts
deleted file mode 100644
index 42551e6..0000000
--- a/i18n/unmaintained/ja/opie-login.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindow</name>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindowImpl</name>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrong password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start OPIE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/opie-sheet.ts b/i18n/unmaintained/ja/opie-sheet.ts
deleted file mode 100644
index 299ca20..0000000
--- a/i18n/unmaintained/ja/opie-sheet.ts
+++ b/dev/null
@@ -1,815 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help file not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/opieftp.ts b/i18n/unmaintained/ja/opieftp.ts
deleted file mode 100644
index 4d84121..0000000
--- a/i18n/unmaintained/ja/opieftp.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OpieFtp</name>
-    <message>
-        <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</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>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ftp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to connect to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to log in
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to upload
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to download 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to list the directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to change directories
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to cd up
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to get working dir
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to make directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to remove directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to rename file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Server name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/opiemail.ts b/i18n/unmaintained/ja/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/unmaintained/ja/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/opieplayer.ts b/i18n/unmaintained/ja/opieplayer.ts
deleted file mode 100644
index b8f82ba..0000000
--- a/i18n/unmaintained/ja/opieplayer.ts
+++ b/dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioDevice</name>
-    <message>
-        <source>Somethin&apos;s wrong with
-your sound device.
-open(&quot;/dev/dsp&quot;)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-
-Closing player now.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/oxygen.ts b/i18n/unmaintained/ja/oxygen.ts
deleted file mode 100644
index 4f674fa..0000000
--- a/i18n/unmaintained/ja/oxygen.ts
+++ b/dev/null
@@ -1,569 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CalcDlg</name>
-    <message>
-        <source>Calculate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OxydataWidget</name>
-    <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Density</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 J</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 pm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Oxygen</name>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PSE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculations</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/parashoot.ts b/i18n/unmaintained/ja/parashoot.ts
deleted file mode 100644
index 0aa33b9..0000000
--- a/i18n/unmaintained/ja/parashoot.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ParaShoot</name>
-    <message>
-        <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>       GAME OVER!
-       Your Score:  %1
- Parachuters Killed: %2
-        Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/patience.ts b/i18n/unmaintained/ja/patience.ts
deleted file mode 100644
index 028b87e..0000000
--- a/i18n/unmaintained/ja/patience.ts
+++ b/dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CanvasCardWindow</name>
-    <message>
-        <source>Patience</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freecell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn Three Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chicane</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Harp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teeclub</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/qasteroids.ts b/i18n/unmaintained/ja/qasteroids.ts
deleted file mode 100644
index 7066645..0000000
--- a/i18n/unmaintained/ja/qasteroids.ts
+++ b/dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KAstTopLevel</name>
-    <message>
-        <source>Asteroids</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ships</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fuel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ship Destroyed.
-Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over.
-Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/qpdf.ts b/i18n/unmaintained/ja/qpdf.ts
deleted file mode 100644
index 2f03c32..0000000
--- a/i18n/unmaintained/ja/qpdf.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPdfDlg</name>
-    <message>
-        <source>QPdf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>125%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/qpe.ts b/i18n/unmaintained/ja/qpe.ts
deleted file mode 100644
index 87b424d..0000000
--- a/i18n/unmaintained/ja/qpe.ts
+++ b/dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownImpl</name>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncAuthentication</name>
-    <message>
-        <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncDialog</name>
-    <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/remote.ts b/i18n/unmaintained/ja/remote.ts
deleted file mode 100644
index 0314a85..0000000
--- a/i18n/unmaintained/ja/remote.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainView</name>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/rotation.ts b/i18n/unmaintained/ja/rotation.ts
deleted file mode 100644
index 8f282b7..0000000
--- a/i18n/unmaintained/ja/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/security.ts b/i18n/unmaintained/ja/security.ts
deleted file mode 100644
index b9ec769..0000000
--- a/i18n/unmaintained/ja/security.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/showimg.ts b/i18n/unmaintained/ja/showimg.ts
deleted file mode 100644
index 8f08d9e..0000000
--- a/i18n/unmaintained/ja/showimg.ts
+++ b/dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ControlsDialog</name>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageFileSelector</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageViewer</name>
-    <message>
-        <source>Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Horizontal flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vertical flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 180</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 90</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> True color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 270</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black And White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsDialogBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/snake.ts b/i18n/unmaintained/ja/snake.ts
deleted file mode 100644
index d9d6107..0000000
--- a/i18n/unmaintained/ja/snake.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SnakeGame</name>
-    <message>
-        <source>Snake</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SNAKE!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use the arrow keys to guide the
-snake to eat the mouse. You must not
-crash into the walls, edges or its tail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Score :    %1   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>GAME OVER!
- Your Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/sound.ts b/i18n/unmaintained/ja/sound.ts
deleted file mode 100644
index 559bf2b..0000000
--- a/i18n/unmaintained/ja/sound.ts
+++ b/dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SoundSettings</name>
-    <message>
-        <source>Shows icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hides icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SoundSettingsBase</name>
-    <message>
-        <source>11025</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>44100</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>16 bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vmemo Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>33075</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visual Alerts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar Icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Calender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>15</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample Rate:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Limit in seconds:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlimited</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie if needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/spreadsheet.ts b/i18n/unmaintained/ja/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/unmaintained/ja/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/sysinfo.ts b/i18n/unmaintained/ja/sysinfo.ts
deleted file mode 100644
index c7d5112..0000000
--- a/i18n/unmaintained/ja/sysinfo.ts
+++ b/dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MemoryInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Buffers (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cached (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Free (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total Memory: %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ModulesInfo</name>
-    <message>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the kernel modules currently loaded on this handheld device.
-
-Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to execute
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MountInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> : %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProcessInfo</name>
-    <message>
-        <source>PID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the processes on this handheld device.
-
-Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SystemInfo</name>
-    <message>
-        <source>System Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VersionInfo</name>
-    <message>
-        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compiled by: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Built on: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/systemtime.ts b/i18n/unmaintained/ja/systemtime.ts
deleted file mode 100644
index dabf608..0000000
--- a/i18n/unmaintained/ja/systemtime.ts
+++ b/dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/tabmanager.ts b/i18n/unmaintained/ja/tabmanager.ts
deleted file mode 100644
index d544c39..0000000
--- a/i18n/unmaintained/ja/tabmanager.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppEdit</name>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exec:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManager</name>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove with applications
-still in the group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManagerBase</name>
-    <message>
-        <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Wait</name>
-    <message>
-        <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/tetrix.ts b/i18n/unmaintained/ja/tetrix.ts
deleted file mode 100644
index 4916eef..0000000
--- a/i18n/unmaintained/ja/tetrix.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTetrix</name>
-    <message>
-        <source>Tetrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/textedit.ts b/i18n/unmaintained/ja/textedit.ts
deleted file mode 100644
index d9e355a..0000000
--- a/i18n/unmaintained/ja/textedit.ts
+++ b/dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextEdit</name>
-    <message>
-        <source>New</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>Save As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start with new file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.desktop File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Linked Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/tictac.ts b/i18n/unmaintained/ja/tictac.ts
deleted file mode 100644
index 1e4a751..0000000
--- a/i18n/unmaintained/ja/tictac.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>TicTacToe</name>
-    <message>
-        <source>Computer starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Human starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click Play to start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make your move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>It&apos;s a draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/today.ts b/i18n/unmaintained/ja/today.ts
deleted file mode 100644
index 6efe1a8..0000000
--- a/i18n/unmaintained/ja/today.ts
+++ b/dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Today</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please fill out the business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayBase</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayConfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>active/order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/todolist.ts b/i18n/unmaintained/ja/todolist.ts
deleted file mode 100644
index ac79230..0000000
--- a/i18n/unmaintained/ja/todolist.ts
+++ b/dev/null
@@ -1,443 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only over due</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Overview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Ref</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Enter Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableView</name>
-    <message>
-        <source>C.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prior.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Table View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvanced</name>
-    <message>
-        <source>State:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Postponed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finished</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>test</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintain Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Responsible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coordinating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>60 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>80 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/usermanager.ts b/i18n/unmaintained/ja/usermanager.ts
deleted file mode 100644
index 282a43f..0000000
--- a/i18n/unmaintained/ja/usermanager.ts
+++ b/dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserConfig</name>
-    <message>
-        <source>OPIE User Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <source>Add User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit User</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/wlansetup.ts b/i18n/unmaintained/ja/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/unmaintained/ja/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ja/wordgame.ts b/i18n/unmaintained/ja/wordgame.ts
deleted file mode 100644
index 7b79f74..0000000
--- a/i18n/unmaintained/ja/wordgame.ts
+++ b/dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Board</name>
-    <message>
-        <source>Blanks: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewGameBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AI3: Smart AI player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RulesBase</name>
-    <message>
-        <source>Game Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ScoreInfo</name>
-    <message>
-        <source>&lt;P&gt;Invalid move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Score: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WordGame</name>
-    <message>
-        <source>Word Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to end the game early?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/.cvsignore b/i18n/unmaintained/ko/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/unmaintained/ko/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/unmaintained/ko/.directory b/i18n/unmaintained/ko/.directory
deleted file mode 100644
index 41d3605..0000000
--- a/i18n/unmaintained/ko/.directory
+++ b/dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=Korean
-Name[no]=Koreansk
-Name[de]=Koreanisch
-Name[ja]=韓国語
-Name[ko]=한국어
-Name[hu]=Koreai
-Name[pt]=Coreano
-Name[pt_BR]=Coreano
-Name[es]=Coreano
-Name[it]=Coreano
-Name[sl]=Korejscina
-Name[da]=Koreansk
diff --git a/i18n/unmaintained/ko/addressbook.ts b/i18n/unmaintained/ko/addressbook.ts
deleted file mode 100644
index 117f140..0000000
--- a/i18n/unmaintained/ko/addressbook.ts
+++ b/dev/null
@@ -1,1397 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>AbTable</name>
-    <message>
-        <source>Full Name</source>
-        <translation>성명</translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation>연락처</translation>
-    </message>
-    <message>
-        <source>Pick</source>
-        <translation>고르기</translation>
-    </message>
-</context>
-<context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation>주소록</translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation>연락처</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>새로</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>편집</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>지우기</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation>찾기</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation>이메일 쓰기</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation>무선으로 보내기</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation>개인 정보</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>보기</translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation>지금 싱크 중이므로, 정보를 편집 할수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Edit My Personal Details</source>
-        <translation>개인정보 편집</translation>
-    </message>
-    <message>
-        <source>Edit Address</source>
-        <translation>주소 편집</translation>
-    </message>
-    <message>
-        <source>Contacts - My Personal Details</source>
-        <translation>연락처 - 개인정보</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation>용량 부족</translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation>정보를 저장할수 없습니다.
-자리를 비우시고 
-다시 해보시기 바랍니다.
-
-그래도 끝낼까요?</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>모두</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation>정렬 안됨</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation>vCard 읽어 오기</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
-    <message>
-        <source>Query Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notice: QT-Mail is just 
-provided in the SHARP 
-default ROM. Opie-Mail 
-is provided free !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished">글꼴</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished">작은</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished">보통</translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished">큰</translation>
-    </message>
-    <message>
-        <source>Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished">위로</translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished">아래로</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactEditor</name>
-    <message>
-        <source>First Name</source>
-        <translation>이름</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation>중간 이름</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation>성</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation>정렬할 이름</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation>성</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation>직업명</translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation>도시</translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation>주</translation>
-    </message>
-    <message>
-        <source>Country</source>
-        <translation>나라</translation>
-    </message>
-    <message>
-        <source>Full Name...</source>
-        <translation>성명</translation>
-    </message>
-    <message>
-        <source>Organization</source>
-        <translation>조직</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation>분류</translation>
-    </message>
-    <message>
-        <source>Notes...</source>
-        <translation>기타...</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>일반적인</translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation>회사</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>집</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>주소</translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation>우편번호</translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation>미국</translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation>영국</translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation>일본</translation>
-    </message>
-    <message>
-        <source>France</source>
-        <translation>프랑스</translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation>독일</translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation>노르웨이</translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation>카네다</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation>남성</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation>여성</translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation>자세한 정보</translation>
-    </message>
-    <message>
-        <source>Enter Note</source>
-        <translation>노트 입력</translation>
-    </message>
-    <message>
-        <source>Edit Name</source>
-        <translation>이름 편집</translation>
-    </message>
-    <message>
-        <source>Contacts</source>
-        <translation>주소록</translation>
-    </message>
-    <message>
-        <source>Afganistan</source>
-        <translation>아프가니스탄</translation>
-    </message>
-    <message>
-        <source>Albania</source>
-        <translation>알베니아</translation>
-    </message>
-    <message>
-        <source>Algeria</source>
-        <translation>알제리아</translation>
-    </message>
-    <message>
-        <source>American Samoa</source>
-        <translation>미국 사무아</translation>
-    </message>
-    <message>
-        <source>Andorra</source>
-        <translation>안도라</translation>
-    </message>
-    <message>
-        <source>Angola</source>
-        <translation>안골리아</translation>
-    </message>
-    <message>
-        <source>Anguilla</source>
-        <translation>안구일라</translation>
-    </message>
-    <message>
-        <source>Antartica</source>
-        <translation>남극</translation>
-    </message>
-    <message>
-        <source>Argentina</source>
-        <translation>아르헨티나</translation>
-    </message>
-    <message>
-        <source>Armania</source>
-        <translation>아르메니아</translation>
-    </message>
-    <message>
-        <source>Aruba</source>
-        <translation>아루바</translation>
-    </message>
-    <message>
-        <source>Australia</source>
-        <translation>오스트레일리아</translation>
-    </message>
-    <message>
-        <source>Austria</source>
-        <translation>오스트리아</translation>
-    </message>
-    <message>
-        <source>Azerbaijan</source>
-        <translation>아제르바이잔</translation>
-    </message>
-    <message>
-        <source>Bahamas</source>
-        <translation>바하마</translation>
-    </message>
-    <message>
-        <source>Bahrain</source>
-        <translation>바레안</translation>
-    </message>
-    <message>
-        <source>Bangladesh</source>
-        <translation>방그라데쉬</translation>
-    </message>
-    <message>
-        <source>Barbados</source>
-        <translation>바베이도스</translation>
-    </message>
-    <message>
-        <source>Belarus</source>
-        <translation>베라루스</translation>
-    </message>
-    <message>
-        <source>Belgium</source>
-        <translation>벨지움</translation>
-    </message>
-    <message>
-        <source>Belize</source>
-        <translation>벨리즈</translation>
-    </message>
-    <message>
-        <source>Benin</source>
-        <translation>베닌</translation>
-    </message>
-    <message>
-        <source>Bermuda</source>
-        <translation>버뮤다</translation>
-    </message>
-    <message>
-        <source>Bhutan</source>
-        <translation>부탄 왕국</translation>
-    </message>
-    <message>
-        <source>Boliva</source>
-        <translation>볼리비아</translation>
-    </message>
-    <message>
-        <source>Botswana</source>
-        <translation>보츠와나</translation>
-    </message>
-    <message>
-        <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brazil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burundi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cambodia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>China</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colombia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comoros</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cook Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Croatia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cuba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyprus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Denmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Djibouti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>East Timor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ecuador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Egypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>El Salvador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eritrea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fiji</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Guiana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gabon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Georgia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greece</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greenland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Grenada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guatemala</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guyana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Haiti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holy See</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Honduras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hungary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iceland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>India</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indonesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ireland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Israel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jordan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kenya</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Korea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Laos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Latvia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lebanon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lesotho</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liberia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithuania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macedonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Madagascar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malawi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malaysia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maldives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mali</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Martinique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mayotte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mexico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micronesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moldova</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monaco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mongolia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Montserrat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Morocco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mozambique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Myanmar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Namibia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nauru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nepal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Netherlands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Zealand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nigeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oman</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pakistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panama</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paraguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Philippines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Poland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portugal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reunion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Romania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Russia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rwanda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>San Marino</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Senegal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seychelles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Singapore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovakia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Somalia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>South Africa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>St. Helena</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sudan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suriname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Swaziland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sweden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switzerland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taiwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tanzania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thailand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Togo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tokelau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tonga</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunisia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uganda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ukraine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uruguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Venezuela</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Western Sahara</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Yemen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation>생일</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation>결혼 기념일</translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished">지우기</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished">회사 전화</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished">회사 팩스</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished">회사 핸드폰</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished">기본 이메일 주소</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished">이메일 주소들</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished">집 전화</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished">집 팩스</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished">집 핸드폰</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished">회사</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished">직업</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished">비서</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished">매니저</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished">배우자</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished">성</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished">생일</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished">결혼 기념일</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished">별명</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished">자식들</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished">직위</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished">이름</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished">중간 이름</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished">성</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished">정렬할 이름</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished">직업명</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished">부</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished">회사</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished">회사 주소</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished">회사 도시</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished">회사 주</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished">회사 우편번호</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished">회사 국가</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished">회사 삐삐</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished">회사 웹사이트</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished">집 주소</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished">집 도시</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished">집 주</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished">집 우편번호</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished">집 국가</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished">집 웹사이트</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished">기타</translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished">분류들</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/advancedfm.ts b/i18n/unmaintained/ko/advancedfm.ts
deleted file mode 100644
index 070ddfe..0000000
--- a/i18n/unmaintained/ko/advancedfm.ts
+++ b/dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedFm</name>
-    <message>
-        <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</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>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Output</name>
-    <message>
-        <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/appearance.ts b/i18n/unmaintained/ko/appearance.ts
deleted file mode 100644
index b210e58..0000000
--- a/i18n/unmaintained/ko/appearance.ts
+++ b/dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Appearance</name>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished">설정...</translation>
-    </message>
-    <message>
-        <source>Current scheme</source>
-        <translation type="unfinished">현재 태마</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished">지우기</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished">저장</translation>
-    </message>
-    <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab style:</source>
-        <translation type="unfinished">탭의 종류:</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished">탭</translation>
-    </message>
-    <message>
-        <source>Tabs w/icons</source>
-        <translation type="unfinished">탭과 아이콘</translation>
-    </message>
-    <message>
-        <source>Drop down list</source>
-        <translation type="unfinished">드랍다운 리스트</translation>
-    </message>
-    <message>
-        <source>Drop down list w/icons</source>
-        <translation type="unfinished">아이콘 있는 드랍다운 리스트</translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="unfinished">위</translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <translation type="unfinished">아래</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation type="unfinished">태마</translation>
-    </message>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished">스타일</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished">글꼴</translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished">색깔</translation>
-    </message>
-    <message>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished">고급</translation>
-    </message>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished">재시작</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished">예</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished">아니오</translation>
-    </message>
-    <message>
-        <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete scheme</source>
-        <translation type="unfinished">태마 지우기</translation>
-    </message>
-    <message>
-        <source>Unable to delete current scheme.</source>
-        <translation type="unfinished">태마를 지울수 없습니다</translation>
-    </message>
-    <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
-
-Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure the currently selected style.
-
-Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Window decorations control the way the application title bar and its buttons appear.
-
-Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color schemes are a collection of colors which are used for various parts of the display.
-
-Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
-
-1. Tabs - normal tabs with text labels only
-2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
-3. Drop down list - a vertical listing of tabs
-4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation>태마 편집</translation>
-    </message>
-    <message>
-        <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleWindow</name>
-    <message>
-        <source>Sample</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/appskey.ts b/i18n/unmaintained/ko/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/unmaintained/ko/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/backup.ts b/i18n/unmaintained/ko/backup.ts
deleted file mode 100644
index 02b6cc2..0000000
--- a/i18n/unmaintained/ko/backup.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BackupAndRestore</name>
-    <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
-    <message>
-        <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/bounce.ts b/i18n/unmaintained/ko/bounce.ts
deleted file mode 100644
index 9d2d3d1..0000000
--- a/i18n/unmaintained/ko/bounce.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KJezzball</name>
-    <message>
-        <source>Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game paused.
-Press P to continue!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over!
-Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully cleared more than 75%.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: 15 points per life
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Bonus
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Total score
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On to level %1.
-You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/buzzword.ts b/i18n/unmaintained/ko/buzzword.ts
deleted file mode 100644
index 076f679..0000000
--- a/i18n/unmaintained/ko/buzzword.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BuzzWord</name>
-    <message>
-        <source>buZzword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/calculator.ts b/i18n/unmaintained/ko/calculator.ts
deleted file mode 100644
index edd7e16..0000000
--- a/i18n/unmaintained/ko/calculator.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calculator</name>
-    <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ln</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>tan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+/-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CalculatorImpl</name>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/checkbook.ts b/i18n/unmaintained/ko/checkbook.ts
deleted file mode 100644
index 77b4422..0000000
--- a/i18n/unmaintained/ko/checkbook.ts
+++ b/dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Checkbook</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transactions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIN number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all transactions entered for this checkbook.
-
-To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password protect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Num</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Configuration</name>
-    <message>
-        <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show whether checkbook is password
-protected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new checkbook.
-
-You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to edit it.
-
-You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here delete it.
-
-You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Transaction</name>
-    <message>
-        <source>Transaction for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction type here.
-
-The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/citytime.ts b/i18n/unmaintained/ko/citytime.ts
deleted file mode 100644
index a250baf..0000000
--- a/i18n/unmaintained/ko/citytime.ts
+++ b/dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CityTime</name>
-    <message>
-        <source>Time Changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting timezone %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CityTimeBase</name>
-    <message>
-        <source>City Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ZoneMap</name>
-    <message>
-        <source>CITY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to Find Timezone Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/clock.ts b/i18n/unmaintained/ko/clock.ts
deleted file mode 100644
index d4a93dc..0000000
--- a/i18n/unmaintained/ko/clock.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Clock</name>
-    <message>
-        <source>Snooze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/confedit.ts b/i18n/unmaintained/ko/confedit.ts
deleted file mode 100644
index a4f440a..0000000
--- a/i18n/unmaintained/ko/confedit.ts
+++ b/dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>EditWidget</name>
-    <message>
-        <source>File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewConfDir</name>
-    <message>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewItemConfFile</name>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>no group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/datebook.ts b/i18n/unmaintained/ko/datebook.ts
deleted file mode 100644
index 621fcc7..0000000
--- a/i18n/unmaintained/ko/datebook.ts
+++ b/dev/null
@@ -1,741 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time (dayview)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>W: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/drawpad.ts b/i18n/unmaintained/ko/drawpad.ts
deleted file mode 100644
index d8b80c5..0000000
--- a/i18n/unmaintained/ko/drawpad.ts
+++ b/dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/embeddedkonsole.ts b/i18n/unmaintained/ko/embeddedkonsole.ts
deleted file mode 100644
index 81b9d45..0000000
--- a/i18n/unmaintained/ko/embeddedkonsole.ts
+++ b/dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CommandEditDialog</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommandEditDialogBase</name>
-    <message>
-        <source>Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Konsole</name>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Yellow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Magenta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magenta on Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyan on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Cyan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amber on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ScrollBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Beep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>editCommandBase</name>
-    <message>
-        <source>Add command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter command to add:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/fifteen.ts b/i18n/unmaintained/ko/fifteen.ts
deleted file mode 100644
index b52d689..0000000
--- a/i18n/unmaintained/ko/fifteen.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FifteenMainWindow</name>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PiecesTable</name>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulations!
-You win the game!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;andomize Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reset Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/filebrowser.ts b/i18n/unmaintained/ko/filebrowser.ts
deleted file mode 100644
index 873627f..0000000
--- a/i18n/unmaintained/ko/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>파일 관리자</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>위치</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>정렬</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>이름순</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>크기순</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>날자순</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>종류순</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>가나다순</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>숨긴파일</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>시스템 링크</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>보기</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>이전 디렉토리</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>부모 디렉토리</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>새 폴더</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>자르기</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>복사</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>붙이기</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>썹네일</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>파일 관리자</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>/dev 디렉토리 볼수 없습니다</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>확인</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>이름 바꾸기</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>이름 바꾸기 실패!</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>붙이기</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>붙이기 실패!</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>확인</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>파일 자르기</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>자르기 실패</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>지우기</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>확실 합니까?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>예</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>아뇨</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>지우기 실패!</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>새 폴더</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>새 폴더 생산 실패!</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>프로그램 실행</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>실행 실패!</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>문서에 추가</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>실행</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>텍스트으로 보기</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>이름 바꾸기</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>자르기</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>복사</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>붙이기</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>권한 바꾸기</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>모두 선택</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>모두 선택 안함</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>권한 바꾸기</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>파일 권한 설정</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>파일 권한 설정:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>주인</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>그룹</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>기타</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>주인</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>그룹</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>읽기</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>쓰기</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>실행</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/formatter.ts b/i18n/unmaintained/ko/formatter.ts
deleted file mode 100644
index 751e732..0000000
--- a/i18n/unmaintained/ko/formatter.ts
+++ b/dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatterApp</name>
-    <message>
-        <source>Formatter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mount Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really format
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not format.
-Unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>umount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not umount.
-Device is busy!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such device!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/go.ts b/i18n/unmaintained/ko/go.ts
deleted file mode 100644
index 07e1e03..0000000
--- a/i18n/unmaintained/ko/go.ts
+++ b/dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GoMainWidget</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resign</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two player option</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>GoWidget</name>
-    <message>
-        <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A draw.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/helpbrowser.ts b/i18n/unmaintained/ko/helpbrowser.ts
deleted file mode 100644
index 4951556..0000000
--- a/i18n/unmaintained/ko/helpbrowser.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <source>Backward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HelpBrowser</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/kbill.ts b/i18n/unmaintained/ko/kbill.ts
deleted file mode 100644
index 10b6638..0000000
--- a/i18n/unmaintained/ko/kbill.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KBill</name>
-    <message>
-        <source>kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UI</name>
-    <message>
-        <source>After Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your score</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/kcheckers.ts b/i18n/unmaintained/ko/kcheckers.ts
deleted file mode 100644
index 01e6872..0000000
--- a/i18n/unmaintained/ko/kcheckers.ts
+++ b/dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KCheckers</name>
-    <message>
-        <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> New Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Undo Move </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/keypebble.ts b/i18n/unmaintained/ko/keypebble.ts
deleted file mode 100644
index 3da72e1..0000000
--- a/i18n/unmaintained/ko/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/kpacman.ts b/i18n/unmaintained/ko/kpacman.ts
deleted file mode 100644
index fb73268..0000000
--- a/i18n/unmaintained/ko/kpacman.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keys</name>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Kpacman</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@PACKAGE@ - @VERSION@
-
-Joerg Thoennissen (joe@dsite.de)
-
-A pacman game for the KDE Desktop
-
-The program based on the source of ksnake
-by Michel Filippi (mfilippi@sade.rhein-main.de).
-The design was strongly influenced by the pacman
-(c) 1980 MIDWAY MFG.CO.
-
-I like to thank my girlfriend Elke Krueers for
-the last 10 years of her friendship.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KpacmanWidget</name>
-    <message>
-        <source>The bitfont could not be contructed.
-
-The file &apos;@FONTNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Referee</name>
-    <message>
-        <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>READY!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-POKEY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Score</name>
-    <message>
-        <source>  1UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  2UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Status</name>
-    <message>
-        <source>The pixmap could not be contructed.
-
-The file &apos;@PIXMAPNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/language.ts b/i18n/unmaintained/ko/language.ts
deleted file mode 100644
index 24fd93b..0000000
--- a/i18n/unmaintained/ko/language.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LanguageSettings</name>
-    <message>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>default</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageSettingsBase</name>
-    <message>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select language</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libbatteryapplet-ipaq.ts b/i18n/unmaintained/ko/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/unmaintained/ko/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libbatteryapplet.ts b/i18n/unmaintained/ko/libbatteryapplet.ts
deleted file mode 100644
index 0f0c5ce..0000000
--- a/i18n/unmaintained/ko/libbatteryapplet.ts
+++ b/dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libcardmonapplet.ts b/i18n/unmaintained/ko/libcardmonapplet.ts
deleted file mode 100644
index 441a701..0000000
--- a/i18n/unmaintained/ko/libcardmonapplet.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CardMonitor</name>
-    <message>
-        <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libclipboardapplet.ts b/i18n/unmaintained/ko/libclipboardapplet.ts
deleted file mode 100644
index 9b0ac97..0000000
--- a/i18n/unmaintained/ko/libclipboardapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ClipboardApplet</name>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libdialup.ts b/i18n/unmaintained/ko/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/unmaintained/ko/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libhomeapplet.ts b/i18n/unmaintained/ko/libhomeapplet.ts
deleted file mode 100644
index 35433b8..0000000
--- a/i18n/unmaintained/ko/libhomeapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HomeApplet</name>
-    <message>
-        <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libirdaapplet.ts b/i18n/unmaintained/ko/libirdaapplet.ts
deleted file mode 100644
index 1000064..0000000
--- a/i18n/unmaintained/ko/libirdaapplet.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IrdaApplet</name>
-    <message>
-        <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Found:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lost:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/liblan.ts b/i18n/unmaintained/ko/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/unmaintained/ko/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libliquid.ts b/i18n/unmaintained/ko/libliquid.ts
deleted file mode 100644
index 410b29e..0000000
--- a/i18n/unmaintained/ko/libliquid.ts
+++ b/dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSettings</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/liblogoutapplet.ts b/i18n/unmaintained/ko/liblogoutapplet.ts
deleted file mode 100644
index 06cbe25..0000000
--- a/i18n/unmaintained/ko/liblogoutapplet.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LogoutApplet</name>
-    <message>
-        <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to
-end this session ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libmadplugin.ts b/i18n/unmaintained/ko/libmadplugin.ts
deleted file mode 100644
index 775b417..0000000
--- a/i18n/unmaintained/ko/libmadplugin.ts
+++ b/dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LibMadPlugin</name>
-    <message>
-        <source>No Song Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Track: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Genre: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bitrate: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libmetal.ts b/i18n/unmaintained/ko/libmetal.ts
deleted file mode 100644
index b82c564..0000000
--- a/i18n/unmaintained/ko/libmetal.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Metal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libnetmonapplet.ts b/i18n/unmaintained/ko/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/unmaintained/ko/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libopie.ts b/i18n/unmaintained/ko/libopie.ts
deleted file mode 100644
index cbaa47b..0000000
--- a/i18n/unmaintained/ko/libopie.ts
+++ b/dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ORecurranceBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>TimePicker</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>
-</TS>
diff --git a/i18n/unmaintained/ko/libopieobex.ts b/i18n/unmaintained/ko/libopieobex.ts
deleted file mode 100644
index 99d06ec..0000000
--- a/i18n/unmaintained/ko/libopieobex.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqdvorak.ts b/i18n/unmaintained/ko/libqdvorak.ts
deleted file mode 100644
index 5e1ab53..0000000
--- a/i18n/unmaintained/ko/libqdvorak.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqhandwriting.ts b/i18n/unmaintained/ko/libqhandwriting.ts
deleted file mode 100644
index 20ed59b..0000000
--- a/i18n/unmaintained/ko/libqhandwriting.ts
+++ b/dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HandwritingHelp</name>
-    <message>
-        <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HandwritingTrainer</name>
-    <message>
-        <source>Matched: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Similar to: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No match</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenEdit</name>
-    <message>
-        <source>New...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInput</name>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInputCharDlg</name>
-    <message>
-        <source>Enter new character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenPrefBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenSetup</name>
-    <message>
-        <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Customize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqjumpx.ts b/i18n/unmaintained/ko/libqjumpx.ts
deleted file mode 100644
index 80ea414..0000000
--- a/i18n/unmaintained/ko/libqjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqkeyboard.ts b/i18n/unmaintained/ko/libqkeyboard.ts
deleted file mode 100644
index 318758e..0000000
--- a/i18n/unmaintained/ko/libqkeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqkjumpx.ts b/i18n/unmaintained/ko/libqkjumpx.ts
deleted file mode 100644
index 964d5dc..0000000
--- a/i18n/unmaintained/ko/libqkjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqmultikey.ts b/i18n/unmaintained/ko/libqmultikey.ts
deleted file mode 100644
index d1d7b71..0000000
--- a/i18n/unmaintained/ko/libqmultikey.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Multikey Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keymap File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Pressed Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Multikey</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqpe.ts b/i18n/unmaintained/ko/libqpe.ts
deleted file mode 100644
index 4421779..0000000
--- a/i18n/unmaintained/ko/libqpe.ts
+++ b/dev/null
@@ -1,890 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</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>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqpickboard.ts b/i18n/unmaintained/ko/libqpickboard.ts
deleted file mode 100644
index 488fb8f..0000000
--- a/i18n/unmaintained/ko/libqpickboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libqunikeyboard.ts b/i18n/unmaintained/ko/libqunikeyboard.ts
deleted file mode 100644
index 6966daa..0000000
--- a/i18n/unmaintained/ko/libqunikeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libscreenshotapplet.ts b/i18n/unmaintained/ko/libscreenshotapplet.ts
deleted file mode 100644
index 057c267..0000000
--- a/i18n/unmaintained/ko/libscreenshotapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ScreenshotControl</name>
-    <message>
-        <source>Snapshot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>scap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libsdmonapplet.ts b/i18n/unmaintained/ko/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/unmaintained/ko/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libsuspendapplet.ts b/i18n/unmaintained/ko/libsuspendapplet.ts
deleted file mode 100644
index bdfb04c..0000000
--- a/i18n/unmaintained/ko/libsuspendapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SuspendApplet</name>
-    <message>
-        <source>Suspend shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libtheme.ts b/i18n/unmaintained/ko/libtheme.ts
deleted file mode 100644
index 53a4018..0000000
--- a/i18n/unmaintained/ko/libtheme.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Themed style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThemeSettings</name>
-    <message>
-        <source>Theme Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the theme to be used</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[No theme]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libvmemoapplet.ts b/i18n/unmaintained/ko/libvmemoapplet.ts
deleted file mode 100644
index 8371675..0000000
--- a/i18n/unmaintained/ko/libvmemoapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VMemo</name>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>error recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libvolumeapplet.ts b/i18n/unmaintained/ko/libvolumeapplet.ts
deleted file mode 100644
index fbb6fb9..0000000
--- a/i18n/unmaintained/ko/libvolumeapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VolumeControl</name>
-    <message>
-        <source>Enable Sounds for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Clicks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Taps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/libwirelessapplet.ts b/i18n/unmaintained/ko/libwirelessapplet.ts
deleted file mode 100644
index cdfb61d..0000000
--- a/i18n/unmaintained/ko/libwirelessapplet.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedConfigBase</name>
-    <message>
-        <source>Advanced Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renew DHCP on changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MODE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AccessPoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/light-and-power.ts b/i18n/unmaintained/ko/light-and-power.ts
deleted file mode 100644
index 0deb0b7..0000000
--- a/i18n/unmaintained/ko/light-and-power.ts
+++ b/dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibration</name>
-    <message>
-        <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LightSettingsBase</name>
-    <message>
-        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dim light after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light off after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on Battery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on AC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warnings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SensorBase</name>
-    <message>
-        <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/liquid-settings.ts b/i18n/unmaintained/ko/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/unmaintained/ko/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/mediummount.ts b/i18n/unmaintained/ko/mediummount.ts
deleted file mode 100644
index dba8eda..0000000
--- a/i18n/unmaintained/ko/mediummount.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/mindbreaker.ts b/i18n/unmaintained/ko/mindbreaker.ts
deleted file mode 100644
index 598d561..0000000
--- a/i18n/unmaintained/ko/mindbreaker.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MindBreaker</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MindBreakerBoard</name>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/minesweep.ts b/i18n/unmaintained/ko/minesweep.ts
deleted file mode 100644
index 1dd7e7f..0000000
--- a/i18n/unmaintained/ko/minesweep.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MineSweep</name>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You exploded!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/mobilemsg.ts b/i18n/unmaintained/ko/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/unmaintained/ko/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/mpegplayer.ts b/i18n/unmaintained/ko/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/unmaintained/ko/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/netsetup.ts b/i18n/unmaintained/ko/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/unmaintained/ko/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/oipkg.ts b/i18n/unmaintained/ko/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/unmaintained/ko/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/opie-login.ts b/i18n/unmaintained/ko/opie-login.ts
deleted file mode 100644
index 42551e6..0000000
--- a/i18n/unmaintained/ko/opie-login.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindow</name>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindowImpl</name>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrong password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start OPIE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/opie-sh.ts b/i18n/unmaintained/ko/opie-sh.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/ko/opie-sh.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/ko/opie-sheet.ts b/i18n/unmaintained/ko/opie-sheet.ts
deleted file mode 100644
index 299ca20..0000000
--- a/i18n/unmaintained/ko/opie-sheet.ts
+++ b/dev/null
@@ -1,815 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help file not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/opieftp.ts b/i18n/unmaintained/ko/opieftp.ts
deleted file mode 100644
index 4d84121..0000000
--- a/i18n/unmaintained/ko/opieftp.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OpieFtp</name>
-    <message>
-        <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</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>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ftp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to connect to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to log in
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to upload
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to download 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to list the directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to change directories
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to cd up
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to get working dir
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to make directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to remove directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to rename file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Server name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/opiemail.ts b/i18n/unmaintained/ko/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/unmaintained/ko/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/opieplayer.ts b/i18n/unmaintained/ko/opieplayer.ts
deleted file mode 100644
index b8f82ba..0000000
--- a/i18n/unmaintained/ko/opieplayer.ts
+++ b/dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioDevice</name>
-    <message>
-        <source>Somethin&apos;s wrong with
-your sound device.
-open(&quot;/dev/dsp&quot;)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-
-Closing player now.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/oxygen.ts b/i18n/unmaintained/ko/oxygen.ts
deleted file mode 100644
index 4f674fa..0000000
--- a/i18n/unmaintained/ko/oxygen.ts
+++ b/dev/null
@@ -1,569 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CalcDlg</name>
-    <message>
-        <source>Calculate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OxydataWidget</name>
-    <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Density</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 J</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 pm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Oxygen</name>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PSE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculations</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/parashoot.ts b/i18n/unmaintained/ko/parashoot.ts
deleted file mode 100644
index 0aa33b9..0000000
--- a/i18n/unmaintained/ko/parashoot.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ParaShoot</name>
-    <message>
-        <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>       GAME OVER!
-       Your Score:  %1
- Parachuters Killed: %2
-        Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/patience.ts b/i18n/unmaintained/ko/patience.ts
deleted file mode 100644
index 028b87e..0000000
--- a/i18n/unmaintained/ko/patience.ts
+++ b/dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CanvasCardWindow</name>
-    <message>
-        <source>Patience</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freecell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn Three Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chicane</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Harp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teeclub</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/qasteroids.ts b/i18n/unmaintained/ko/qasteroids.ts
deleted file mode 100644
index 7066645..0000000
--- a/i18n/unmaintained/ko/qasteroids.ts
+++ b/dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KAstTopLevel</name>
-    <message>
-        <source>Asteroids</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ships</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fuel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ship Destroyed.
-Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over.
-Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/qcop.ts b/i18n/unmaintained/ko/qcop.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/ko/qcop.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/ko/qpdf.ts b/i18n/unmaintained/ko/qpdf.ts
deleted file mode 100644
index 2f03c32..0000000
--- a/i18n/unmaintained/ko/qpdf.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPdfDlg</name>
-    <message>
-        <source>QPdf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>125%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/qpe.ts b/i18n/unmaintained/ko/qpe.ts
deleted file mode 100644
index 87b424d..0000000
--- a/i18n/unmaintained/ko/qpe.ts
+++ b/dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownImpl</name>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncAuthentication</name>
-    <message>
-        <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncDialog</name>
-    <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/remote.ts b/i18n/unmaintained/ko/remote.ts
deleted file mode 100644
index 0314a85..0000000
--- a/i18n/unmaintained/ko/remote.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainView</name>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/rotation.ts b/i18n/unmaintained/ko/rotation.ts
deleted file mode 100644
index 8f282b7..0000000
--- a/i18n/unmaintained/ko/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/security.ts b/i18n/unmaintained/ko/security.ts
deleted file mode 100644
index b9ec769..0000000
--- a/i18n/unmaintained/ko/security.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/showimg.ts b/i18n/unmaintained/ko/showimg.ts
deleted file mode 100644
index 8f08d9e..0000000
--- a/i18n/unmaintained/ko/showimg.ts
+++ b/dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ControlsDialog</name>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageFileSelector</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageViewer</name>
-    <message>
-        <source>Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Horizontal flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vertical flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 180</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 90</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> True color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 270</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black And White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsDialogBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/snake.ts b/i18n/unmaintained/ko/snake.ts
deleted file mode 100644
index d9d6107..0000000
--- a/i18n/unmaintained/ko/snake.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SnakeGame</name>
-    <message>
-        <source>Snake</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SNAKE!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use the arrow keys to guide the
-snake to eat the mouse. You must not
-crash into the walls, edges or its tail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Score :    %1   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>GAME OVER!
- Your Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/sound.ts b/i18n/unmaintained/ko/sound.ts
deleted file mode 100644
index 559bf2b..0000000
--- a/i18n/unmaintained/ko/sound.ts
+++ b/dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SoundSettings</name>
-    <message>
-        <source>Shows icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hides icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SoundSettingsBase</name>
-    <message>
-        <source>11025</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>44100</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>16 bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vmemo Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>33075</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visual Alerts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar Icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Calender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>15</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample Rate:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Limit in seconds:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlimited</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie if needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/spreadsheet.ts b/i18n/unmaintained/ko/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/unmaintained/ko/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/sshkeys.ts b/i18n/unmaintained/ko/sshkeys.ts
deleted file mode 100644
index 20e2db6..0000000
--- a/i18n/unmaintained/ko/sshkeys.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SSHKeysApp</name>
-    <message>
-        <source>Error running ssh-add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SSHKeysBase</name>
-    <message>
-        <source>SSH Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Keys:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fingerprint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/sysinfo.ts b/i18n/unmaintained/ko/sysinfo.ts
deleted file mode 100644
index c7d5112..0000000
--- a/i18n/unmaintained/ko/sysinfo.ts
+++ b/dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MemoryInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Buffers (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cached (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Free (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total Memory: %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ModulesInfo</name>
-    <message>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the kernel modules currently loaded on this handheld device.
-
-Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to execute
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MountInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> : %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProcessInfo</name>
-    <message>
-        <source>PID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the processes on this handheld device.
-
-Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SystemInfo</name>
-    <message>
-        <source>System Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VersionInfo</name>
-    <message>
-        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compiled by: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Built on: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/systemtime.ts b/i18n/unmaintained/ko/systemtime.ts
deleted file mode 100644
index dabf608..0000000
--- a/i18n/unmaintained/ko/systemtime.ts
+++ b/dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/tableviewer.ts b/i18n/unmaintained/ko/tableviewer.ts
deleted file mode 100644
index 7d41b6f..0000000
--- a/i18n/unmaintained/ko/tableviewer.ts
+++ b/dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVBrowseKeyEntry</name>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVKeyEdit_gen</name>
-    <message>
-        <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVListView</name>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableViewerWindow</name>
-    <message>
-        <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not load Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/tabmanager.ts b/i18n/unmaintained/ko/tabmanager.ts
deleted file mode 100644
index d544c39..0000000
--- a/i18n/unmaintained/ko/tabmanager.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppEdit</name>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exec:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManager</name>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove with applications
-still in the group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManagerBase</name>
-    <message>
-        <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Wait</name>
-    <message>
-        <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/tetrix.ts b/i18n/unmaintained/ko/tetrix.ts
deleted file mode 100644
index 4916eef..0000000
--- a/i18n/unmaintained/ko/tetrix.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTetrix</name>
-    <message>
-        <source>Tetrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/textedit.ts b/i18n/unmaintained/ko/textedit.ts
deleted file mode 100644
index 14e31f9..0000000
--- a/i18n/unmaintained/ko/textedit.ts
+++ b/dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished">무명</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished">텍스트 편집기</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished">모두</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished">텍스트</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished">권한</translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished">예</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished">아니오</translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextEdit</name>
-    <message>
-        <source>New</source>
-        <translation>새글</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>열기</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>저장</translation>
-    </message>
-    <message>
-        <source>Save As</source>
-        <translation>새 이름으로</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>자르기</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>복사</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>붙이기</translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation>찾기...</translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation>확대</translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation>축소</translation>
-    </message>
-    <message>
-        <source>Wrap lines</source>
-        <translation>줄을 감기</translation>
-    </message>
-    <message>
-        <source>Start with new file</source>
-        <translation>새 문서으로 시작하기</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>파일</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>편집</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>보기</translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation>다음 찾기</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>닫기</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>지우기</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation>텍스트 편집기</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation>글꼴</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>정보</translation>
-    </message>
-    <message>
-        <source>.desktop File</source>
-        <translation>.desktop 파일</translation>
-    </message>
-    <message>
-        <source>Linked Document</source>
-        <translation>링크된 문서</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>모두</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>텍스트</translation>
-    </message>
-    <message>
-        <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>파일 권한 설정</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>파일 권한 설정:</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>주인</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>그룹</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>기타</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>주인</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>그룹</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>읽기</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>쓰기</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>실행</translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation>경고</translation>
-    </message>
-    <message>
-        <source>Error- no user</source>
-        <translation>에러- 유저가 없음</translation>
-    </message>
-    <message>
-        <source>Error- no  group</source>
-        <translation>에러- 그룹이 없음</translation>
-    </message>
-    <message>
-        <source>Error setting ownership or group</source>
-        <translation>소유권이나 그룹을 설정하는데 에러 발생</translation>
-    </message>
-    <message>
-        <source>Error setting mode</source>
-        <translation>모드 설정하는데 에러 발생</translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/tictac.ts b/i18n/unmaintained/ko/tictac.ts
deleted file mode 100644
index 1e4a751..0000000
--- a/i18n/unmaintained/ko/tictac.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>TicTacToe</name>
-    <message>
-        <source>Computer starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Human starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click Play to start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make your move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>It&apos;s a draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/today.ts b/i18n/unmaintained/ko/today.ts
deleted file mode 100644
index 6efe1a8..0000000
--- a/i18n/unmaintained/ko/today.ts
+++ b/dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Today</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please fill out the business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayBase</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayConfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>active/order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/todolist.ts b/i18n/unmaintained/ko/todolist.ts
deleted file mode 100644
index c4f6d68..0000000
--- a/i18n/unmaintained/ko/todolist.ts
+++ b/dev/null
@@ -1,449 +0,0 @@
-<!DOCTYPE TS><TS>
-<defaultcodec>iso8859-1</defaultcodec>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished">새 할일</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">할일 편집</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished">할일 보기</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished">지우기...</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="unfinished">모두 지우기...</translation>
-    </message>
-    <message>
-        <source>Delete completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished">복사 하기</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished">무선 전송</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished">찾기</translation>
-    </message>
-    <message>
-        <source>Completed tasks</source>
-        <translation type="unfinished">성취한 일들을 표시</translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation type="unfinished">마감일을 표시</translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished">데이타</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished">분류</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished">옵션들</translation>
-    </message>
-    <message>
-        <source>Show only over due</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Categories</source>
-        <translation type="unfinished">모든 분류</translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished">자리 부족</translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished">수정된 데이타를 저장할수 
-없었습니다.
-자리를 비우시고 
-다시 해보시기 바랍니다.
-
-그래도 끝낼까요?</translation>
-    </message>
-    <message>
-        <source>Todo</source>
-        <translation type="unfinished">할일</translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished">현제 싱크 중이므로 데이타 편집 불가</translation>
-    </message>
-    <message>
-        <source>all tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Overview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Ref</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Enter Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished">할일 편집</translation>
-    </message>
-</context>
-<context>
-    <name>TableView</name>
-    <message>
-        <source>C.</source>
-        <translation type="unfinished">成</translation>
-    </message>
-    <message>
-        <source>Prior.</source>
-        <translation type="unfinished">우선순위</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished">설명</translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished">마감</translation>
-    </message>
-    <message>
-        <source>Table View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvanced</name>
-    <message>
-        <source>State:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Postponed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finished</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>test</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintain Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Responsible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coordinating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished">설명</translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>60 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>80 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished">분류</translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished">할일 목록</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/usermanager.ts b/i18n/unmaintained/ko/usermanager.ts
deleted file mode 100644
index 282a43f..0000000
--- a/i18n/unmaintained/ko/usermanager.ts
+++ b/dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserConfig</name>
-    <message>
-        <source>OPIE User Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <source>Add User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit User</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/wlansetup.ts b/i18n/unmaintained/ko/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/unmaintained/ko/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/ko/wordgame.ts b/i18n/unmaintained/ko/wordgame.ts
deleted file mode 100644
index 7b79f74..0000000
--- a/i18n/unmaintained/ko/wordgame.ts
+++ b/dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Board</name>
-    <message>
-        <source>Blanks: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewGameBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AI3: Smart AI player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RulesBase</name>
-    <message>
-        <source>Game Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ScoreInfo</name>
-    <message>
-        <source>&lt;P&gt;Invalid move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Score: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WordGame</name>
-    <message>
-        <source>Word Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to end the game early?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/.cvsignore b/i18n/unmaintained/no/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/unmaintained/no/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/unmaintained/no/.directory b/i18n/unmaintained/no/.directory
deleted file mode 100644
index 5d558c3..0000000
--- a/i18n/unmaintained/no/.directory
+++ b/dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Norwegian
-Name[no]=Norsk
-Name[ja]=ノルウェー語
-Name[de]=Norwegisch
-Name[hu]=Norvég
-Name[pt]=Norueguês
-Name[pt_BR]=Norueguês
-Name[es]=Noruego
-Name[it]=Norvescina
-Name[da]=Norsk
diff --git a/i18n/unmaintained/no/addressbook.ts b/i18n/unmaintained/no/addressbook.ts
deleted file mode 100644
index 07e577f..0000000
--- a/i18n/unmaintained/no/addressbook.ts
+++ b/dev/null
@@ -1,1392 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AbTable</name>
-    <message>
-        <source>Full Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pick</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts - My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
-    <message>
-        <source>Query Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notice: QT-Mail is just 
-provided in the SHARP 
-default ROM. Opie-Mail 
-is provided free !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactEditor</name>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>France</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Albania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Algeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>American Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Andorra</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Angola</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anguilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argentina</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aruba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Australia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Austria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahamas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahrain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barbados</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belarus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Benin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bermuda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bhutan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Botswana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brazil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burundi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cambodia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>China</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colombia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comoros</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cook Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Croatia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cuba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyprus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Denmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Djibouti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>East Timor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ecuador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Egypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>El Salvador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eritrea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fiji</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Guiana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gabon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Georgia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greece</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greenland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Grenada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guatemala</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guyana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Haiti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holy See</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Honduras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hungary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iceland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>India</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indonesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ireland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Israel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jordan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kenya</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Korea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Laos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Latvia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lebanon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lesotho</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liberia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithuania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macedonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Madagascar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malawi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malaysia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maldives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mali</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Martinique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mayotte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mexico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micronesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moldova</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monaco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mongolia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Montserrat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Morocco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mozambique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Myanmar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Namibia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nauru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nepal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Netherlands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Zealand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nigeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oman</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pakistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panama</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paraguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Philippines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Poland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portugal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reunion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Romania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Russia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rwanda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>San Marino</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Senegal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seychelles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Singapore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovakia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Somalia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>South Africa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>St. Helena</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sudan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suriname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Swaziland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sweden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switzerland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taiwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tanzania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thailand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Togo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tokelau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tonga</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunisia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uganda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ukraine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uruguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Venezuela</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yemen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/advancedfm.ts b/i18n/unmaintained/no/advancedfm.ts
deleted file mode 100644
index 070ddfe..0000000
--- a/i18n/unmaintained/no/advancedfm.ts
+++ b/dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedFm</name>
-    <message>
-        <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</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>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Output</name>
-    <message>
-        <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/appearance.ts b/i18n/unmaintained/no/appearance.ts
deleted file mode 100644
index 6b7db2b..0000000
--- a/i18n/unmaintained/no/appearance.ts
+++ b/dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Appearance</name>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete current scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
-
-Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure the currently selected style.
-
-Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Window decorations control the way the application title bar and its buttons appear.
-
-Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color schemes are a collection of colors which are used for various parts of the display.
-
-Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
-
-1. Tabs - normal tabs with text labels only
-2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
-3. Drop down list - a vertical listing of tabs
-4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleWindow</name>
-    <message>
-        <source>Sample</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/appskey.ts b/i18n/unmaintained/no/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/unmaintained/no/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/backup.ts b/i18n/unmaintained/no/backup.ts
deleted file mode 100644
index 02b6cc2..0000000
--- a/i18n/unmaintained/no/backup.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BackupAndRestore</name>
-    <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
-    <message>
-        <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/bounce.ts b/i18n/unmaintained/no/bounce.ts
deleted file mode 100644
index 9d2d3d1..0000000
--- a/i18n/unmaintained/no/bounce.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KJezzball</name>
-    <message>
-        <source>Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game paused.
-Press P to continue!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over!
-Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully cleared more than 75%.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: 15 points per life
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Bonus
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Total score
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On to level %1.
-You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/buzzword.ts b/i18n/unmaintained/no/buzzword.ts
deleted file mode 100644
index 076f679..0000000
--- a/i18n/unmaintained/no/buzzword.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BuzzWord</name>
-    <message>
-        <source>buZzword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/calculator.ts b/i18n/unmaintained/no/calculator.ts
deleted file mode 100644
index edd7e16..0000000
--- a/i18n/unmaintained/no/calculator.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calculator</name>
-    <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ln</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>tan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+/-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CalculatorImpl</name>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/checkbook.ts b/i18n/unmaintained/no/checkbook.ts
deleted file mode 100644
index 77b4422..0000000
--- a/i18n/unmaintained/no/checkbook.ts
+++ b/dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Checkbook</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transactions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIN number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all transactions entered for this checkbook.
-
-To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password protect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Num</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Configuration</name>
-    <message>
-        <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show whether checkbook is password
-protected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new checkbook.
-
-You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to edit it.
-
-You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here delete it.
-
-You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Transaction</name>
-    <message>
-        <source>Transaction for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction type here.
-
-The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/citytime.ts b/i18n/unmaintained/no/citytime.ts
deleted file mode 100644
index a250baf..0000000
--- a/i18n/unmaintained/no/citytime.ts
+++ b/dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CityTime</name>
-    <message>
-        <source>Time Changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting timezone %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CityTimeBase</name>
-    <message>
-        <source>City Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ZoneMap</name>
-    <message>
-        <source>CITY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to Find Timezone Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/clock.ts b/i18n/unmaintained/no/clock.ts
deleted file mode 100644
index d4a93dc..0000000
--- a/i18n/unmaintained/no/clock.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Clock</name>
-    <message>
-        <source>Snooze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/confedit.ts b/i18n/unmaintained/no/confedit.ts
deleted file mode 100644
index a4f440a..0000000
--- a/i18n/unmaintained/no/confedit.ts
+++ b/dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>EditWidget</name>
-    <message>
-        <source>File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewConfDir</name>
-    <message>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewItemConfFile</name>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>no group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/datebook.ts b/i18n/unmaintained/no/datebook.ts
deleted file mode 100644
index 621fcc7..0000000
--- a/i18n/unmaintained/no/datebook.ts
+++ b/dev/null
@@ -1,741 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time (dayview)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>W: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/drawpad.ts b/i18n/unmaintained/no/drawpad.ts
deleted file mode 100644
index d8b80c5..0000000
--- a/i18n/unmaintained/no/drawpad.ts
+++ b/dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/embeddedkonsole.ts b/i18n/unmaintained/no/embeddedkonsole.ts
deleted file mode 100644
index 81b9d45..0000000
--- a/i18n/unmaintained/no/embeddedkonsole.ts
+++ b/dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CommandEditDialog</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommandEditDialogBase</name>
-    <message>
-        <source>Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Konsole</name>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Yellow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Magenta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magenta on Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyan on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Cyan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amber on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ScrollBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Beep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>editCommandBase</name>
-    <message>
-        <source>Add command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter command to add:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/fifteen.ts b/i18n/unmaintained/no/fifteen.ts
deleted file mode 100644
index b52d689..0000000
--- a/i18n/unmaintained/no/fifteen.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FifteenMainWindow</name>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PiecesTable</name>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulations!
-You win the game!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;andomize Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reset Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/filebrowser.ts b/i18n/unmaintained/no/filebrowser.ts
deleted file mode 100644
index aff9a16..0000000
--- a/i18n/unmaintained/no/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/formatter.ts b/i18n/unmaintained/no/formatter.ts
deleted file mode 100644
index 751e732..0000000
--- a/i18n/unmaintained/no/formatter.ts
+++ b/dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatterApp</name>
-    <message>
-        <source>Formatter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mount Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really format
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not format.
-Unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>umount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not umount.
-Device is busy!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such device!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/go.ts b/i18n/unmaintained/no/go.ts
deleted file mode 100644
index 07e1e03..0000000
--- a/i18n/unmaintained/no/go.ts
+++ b/dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GoMainWidget</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resign</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two player option</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>GoWidget</name>
-    <message>
-        <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A draw.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/helpbrowser.ts b/i18n/unmaintained/no/helpbrowser.ts
deleted file mode 100644
index 4951556..0000000
--- a/i18n/unmaintained/no/helpbrowser.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <source>Backward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HelpBrowser</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/kbill.ts b/i18n/unmaintained/no/kbill.ts
deleted file mode 100644
index 10b6638..0000000
--- a/i18n/unmaintained/no/kbill.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KBill</name>
-    <message>
-        <source>kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UI</name>
-    <message>
-        <source>After Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your score</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/kcheckers.ts b/i18n/unmaintained/no/kcheckers.ts
deleted file mode 100644
index 01e6872..0000000
--- a/i18n/unmaintained/no/kcheckers.ts
+++ b/dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KCheckers</name>
-    <message>
-        <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> New Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Undo Move </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/keypebble.ts b/i18n/unmaintained/no/keypebble.ts
deleted file mode 100644
index 3da72e1..0000000
--- a/i18n/unmaintained/no/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/kpacman.ts b/i18n/unmaintained/no/kpacman.ts
deleted file mode 100644
index fb73268..0000000
--- a/i18n/unmaintained/no/kpacman.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keys</name>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Kpacman</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@PACKAGE@ - @VERSION@
-
-Joerg Thoennissen (joe@dsite.de)
-
-A pacman game for the KDE Desktop
-
-The program based on the source of ksnake
-by Michel Filippi (mfilippi@sade.rhein-main.de).
-The design was strongly influenced by the pacman
-(c) 1980 MIDWAY MFG.CO.
-
-I like to thank my girlfriend Elke Krueers for
-the last 10 years of her friendship.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KpacmanWidget</name>
-    <message>
-        <source>The bitfont could not be contructed.
-
-The file &apos;@FONTNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Referee</name>
-    <message>
-        <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>READY!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-POKEY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Score</name>
-    <message>
-        <source>  1UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  2UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Status</name>
-    <message>
-        <source>The pixmap could not be contructed.
-
-The file &apos;@PIXMAPNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/language.ts b/i18n/unmaintained/no/language.ts
deleted file mode 100644
index 24fd93b..0000000
--- a/i18n/unmaintained/no/language.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LanguageSettings</name>
-    <message>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>default</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageSettingsBase</name>
-    <message>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select language</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libbatteryapplet-ipaq.ts b/i18n/unmaintained/no/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/unmaintained/no/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libbatteryapplet.ts b/i18n/unmaintained/no/libbatteryapplet.ts
deleted file mode 100644
index 0f0c5ce..0000000
--- a/i18n/unmaintained/no/libbatteryapplet.ts
+++ b/dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libcardmonapplet.ts b/i18n/unmaintained/no/libcardmonapplet.ts
deleted file mode 100644
index 441a701..0000000
--- a/i18n/unmaintained/no/libcardmonapplet.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CardMonitor</name>
-    <message>
-        <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libclipboardapplet.ts b/i18n/unmaintained/no/libclipboardapplet.ts
deleted file mode 100644
index 9b0ac97..0000000
--- a/i18n/unmaintained/no/libclipboardapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ClipboardApplet</name>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libclockapplet.ts b/i18n/unmaintained/no/libclockapplet.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/no/libclockapplet.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/no/libdialup.ts b/i18n/unmaintained/no/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/unmaintained/no/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libhomeapplet.ts b/i18n/unmaintained/no/libhomeapplet.ts
deleted file mode 100644
index 35433b8..0000000
--- a/i18n/unmaintained/no/libhomeapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HomeApplet</name>
-    <message>
-        <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libirdaapplet.ts b/i18n/unmaintained/no/libirdaapplet.ts
deleted file mode 100644
index 1000064..0000000
--- a/i18n/unmaintained/no/libirdaapplet.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IrdaApplet</name>
-    <message>
-        <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Found:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lost:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/liblan.ts b/i18n/unmaintained/no/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/unmaintained/no/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libliquid.ts b/i18n/unmaintained/no/libliquid.ts
deleted file mode 100644
index 410b29e..0000000
--- a/i18n/unmaintained/no/libliquid.ts
+++ b/dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSettings</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/liblogoutapplet.ts b/i18n/unmaintained/no/liblogoutapplet.ts
deleted file mode 100644
index 06cbe25..0000000
--- a/i18n/unmaintained/no/liblogoutapplet.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LogoutApplet</name>
-    <message>
-        <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to
-end this session ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libmadplugin.ts b/i18n/unmaintained/no/libmadplugin.ts
deleted file mode 100644
index 775b417..0000000
--- a/i18n/unmaintained/no/libmadplugin.ts
+++ b/dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LibMadPlugin</name>
-    <message>
-        <source>No Song Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Track: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Genre: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bitrate: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libmail.ts b/i18n/unmaintained/no/libmail.ts
deleted file mode 100644
index 78c7198..0000000
--- a/i18n/unmaintained/no/libmail.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MailFactory</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SmtpHandler</name>
-    <message>
-        <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server refused the connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host lookup failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The read from the socket failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The sending failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP &gt; %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; EHLO *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; AUTH CRAM-MD5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; HELO *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; MAIL FROM: *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; RCPT TO: *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; DATA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; Sending data...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; QUIT (Done)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP &lt; %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libmetal.ts b/i18n/unmaintained/no/libmetal.ts
deleted file mode 100644
index b82c564..0000000
--- a/i18n/unmaintained/no/libmetal.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Metal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libmpeg3plugin.ts b/i18n/unmaintained/no/libmpeg3plugin.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/no/libmpeg3plugin.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/no/libnetmonapplet.ts b/i18n/unmaintained/no/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/unmaintained/no/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libopie.ts b/i18n/unmaintained/no/libopie.ts
deleted file mode 100644
index cbaa47b..0000000
--- a/i18n/unmaintained/no/libopie.ts
+++ b/dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ORecurranceBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>TimePicker</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>
-</TS>
diff --git a/i18n/unmaintained/no/libopieobex.ts b/i18n/unmaintained/no/libopieobex.ts
deleted file mode 100644
index 99d06ec..0000000
--- a/i18n/unmaintained/no/libopieobex.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqdvorak.ts b/i18n/unmaintained/no/libqdvorak.ts
deleted file mode 100644
index 5e1ab53..0000000
--- a/i18n/unmaintained/no/libqdvorak.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqhandwriting.ts b/i18n/unmaintained/no/libqhandwriting.ts
deleted file mode 100644
index 20ed59b..0000000
--- a/i18n/unmaintained/no/libqhandwriting.ts
+++ b/dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HandwritingHelp</name>
-    <message>
-        <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HandwritingTrainer</name>
-    <message>
-        <source>Matched: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Similar to: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No match</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenEdit</name>
-    <message>
-        <source>New...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInput</name>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInputCharDlg</name>
-    <message>
-        <source>Enter new character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenPrefBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenSetup</name>
-    <message>
-        <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Customize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqjumpx.ts b/i18n/unmaintained/no/libqjumpx.ts
deleted file mode 100644
index 80ea414..0000000
--- a/i18n/unmaintained/no/libqjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqkeyboard.ts b/i18n/unmaintained/no/libqkeyboard.ts
deleted file mode 100644
index 318758e..0000000
--- a/i18n/unmaintained/no/libqkeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqkjumpx.ts b/i18n/unmaintained/no/libqkjumpx.ts
deleted file mode 100644
index 964d5dc..0000000
--- a/i18n/unmaintained/no/libqkjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqmultikey.ts b/i18n/unmaintained/no/libqmultikey.ts
deleted file mode 100644
index d1d7b71..0000000
--- a/i18n/unmaintained/no/libqmultikey.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Multikey Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keymap File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Pressed Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Multikey</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqpe.ts b/i18n/unmaintained/no/libqpe.ts
deleted file mode 100644
index 4421779..0000000
--- a/i18n/unmaintained/no/libqpe.ts
+++ b/dev/null
@@ -1,890 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</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>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqpickboard.ts b/i18n/unmaintained/no/libqpickboard.ts
deleted file mode 100644
index 488fb8f..0000000
--- a/i18n/unmaintained/no/libqpickboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libqunikeyboard.ts b/i18n/unmaintained/no/libqunikeyboard.ts
deleted file mode 100644
index 6966daa..0000000
--- a/i18n/unmaintained/no/libqunikeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libscreenshotapplet.ts b/i18n/unmaintained/no/libscreenshotapplet.ts
deleted file mode 100644
index 057c267..0000000
--- a/i18n/unmaintained/no/libscreenshotapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ScreenshotControl</name>
-    <message>
-        <source>Snapshot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>scap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libsdmonapplet.ts b/i18n/unmaintained/no/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/unmaintained/no/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libsuspendapplet.ts b/i18n/unmaintained/no/libsuspendapplet.ts
deleted file mode 100644
index bdfb04c..0000000
--- a/i18n/unmaintained/no/libsuspendapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SuspendApplet</name>
-    <message>
-        <source>Suspend shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libtheme.ts b/i18n/unmaintained/no/libtheme.ts
deleted file mode 100644
index 53a4018..0000000
--- a/i18n/unmaintained/no/libtheme.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Themed style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThemeSettings</name>
-    <message>
-        <source>Theme Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the theme to be used</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[No theme]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libvmemoapplet.ts b/i18n/unmaintained/no/libvmemoapplet.ts
deleted file mode 100644
index 8371675..0000000
--- a/i18n/unmaintained/no/libvmemoapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VMemo</name>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>error recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libvolumeapplet.ts b/i18n/unmaintained/no/libvolumeapplet.ts
deleted file mode 100644
index fbb6fb9..0000000
--- a/i18n/unmaintained/no/libvolumeapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VolumeControl</name>
-    <message>
-        <source>Enable Sounds for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Clicks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Taps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/libwirelessapplet.ts b/i18n/unmaintained/no/libwirelessapplet.ts
deleted file mode 100644
index cdfb61d..0000000
--- a/i18n/unmaintained/no/libwirelessapplet.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedConfigBase</name>
-    <message>
-        <source>Advanced Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renew DHCP on changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MODE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AccessPoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/light-and-power.ts b/i18n/unmaintained/no/light-and-power.ts
deleted file mode 100644
index 0deb0b7..0000000
--- a/i18n/unmaintained/no/light-and-power.ts
+++ b/dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibration</name>
-    <message>
-        <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LightSettingsBase</name>
-    <message>
-        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dim light after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light off after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on Battery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on AC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warnings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SensorBase</name>
-    <message>
-        <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/liquid-settings.ts b/i18n/unmaintained/no/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/unmaintained/no/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/mail.ts b/i18n/unmaintained/no/mail.ts
deleted file mode 100644
index d251908..0000000
--- a/i18n/unmaintained/no/mail.ts
+++ b/dev/null
@@ -1,903 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AccountEditor</name>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AccountEditorBase</name>
-    <message>
-        <source>Account Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;IMAP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[--]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;SMTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;User:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Pass:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;E-Mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Org:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bcc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply-To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IMAP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>993</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressPicker</name>
-    <message>
-        <source>There are no entries in the addressbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressPickerBase</name>
-    <message>
-        <source>Address Picker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please select an entry first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1&lt;/p</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The queued mails </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> of </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ComposerBase</name>
-    <message>
-        <source>Compose Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attach a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bcc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subj.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prio.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add an Attachement</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Attachement</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDiag</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Question</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDiagBase</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[Hidden]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail notification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blink LED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Check&amp;nbsp;every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable mail notification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
-Sponsored and Programmed by LISAsystems&lt;br&gt;
-Visit http://www.lisa.de/ for Information.
-                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FolderWidget</name>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan folder list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Question</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foldername</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to host.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renaming successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deletion successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder created. Rescanning...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Got folder list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailTable</name>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unseen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Marked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unmarked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mark as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailbox contained no mails.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Getting mail headers...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Got all mail headers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindowBase</name>
-    <message>
-        <source>E-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose new mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send queued mails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show/hide folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search mails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenDiagBase</name>
-    <message>
-        <source>Open file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Stop </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[Icon]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;application/v-card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open using an application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save to disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>(no name)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;Foldertree not known.&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no from)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no subject)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no date)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RenameBase</name>
-    <message>
-        <source>Renaming</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;Renaming</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;to</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchDiag</name>
-    <message>
-        <source>Body</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Header Field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Results</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Search failed. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchDiagBase</name>
-    <message>
-        <source>Mail Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;For:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewMail</name>
-    <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no subject)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no from)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no recipient)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no date)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Getting mail body from server. Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
-    <message>
-        <source>E-Mail by %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/mediummount.ts b/i18n/unmaintained/no/mediummount.ts
deleted file mode 100644
index dba8eda..0000000
--- a/i18n/unmaintained/no/mediummount.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/mindbreaker.ts b/i18n/unmaintained/no/mindbreaker.ts
deleted file mode 100644
index 598d561..0000000
--- a/i18n/unmaintained/no/mindbreaker.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MindBreaker</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MindBreakerBoard</name>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/minesweep.ts b/i18n/unmaintained/no/minesweep.ts
deleted file mode 100644
index 1dd7e7f..0000000
--- a/i18n/unmaintained/no/minesweep.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MineSweep</name>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You exploded!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/mobilemsg.ts b/i18n/unmaintained/no/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/unmaintained/no/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/mpegplayer.ts b/i18n/unmaintained/no/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/unmaintained/no/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/netsetup.ts b/i18n/unmaintained/no/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/unmaintained/no/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/oipkg.ts b/i18n/unmaintained/no/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/unmaintained/no/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/opie-login.ts b/i18n/unmaintained/no/opie-login.ts
deleted file mode 100644
index 42551e6..0000000
--- a/i18n/unmaintained/no/opie-login.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindow</name>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindowImpl</name>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrong password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start OPIE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/opie-sh.ts b/i18n/unmaintained/no/opie-sh.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/no/opie-sh.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/no/opie-sheet.ts b/i18n/unmaintained/no/opie-sheet.ts
deleted file mode 100644
index 299ca20..0000000
--- a/i18n/unmaintained/no/opie-sheet.ts
+++ b/dev/null
@@ -1,815 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help file not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/opieftp.ts b/i18n/unmaintained/no/opieftp.ts
deleted file mode 100644
index 4d84121..0000000
--- a/i18n/unmaintained/no/opieftp.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OpieFtp</name>
-    <message>
-        <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</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>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ftp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to connect to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to log in
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to upload
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to download 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to list the directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to change directories
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to cd up
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to get working dir
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to make directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to remove directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to rename file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Server name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/opiemail.ts b/i18n/unmaintained/no/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/unmaintained/no/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/opieplayer.ts b/i18n/unmaintained/no/opieplayer.ts
deleted file mode 100644
index b8f82ba..0000000
--- a/i18n/unmaintained/no/opieplayer.ts
+++ b/dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioDevice</name>
-    <message>
-        <source>Somethin&apos;s wrong with
-your sound device.
-open(&quot;/dev/dsp&quot;)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-
-Closing player now.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/oxygen.ts b/i18n/unmaintained/no/oxygen.ts
deleted file mode 100644
index 4f674fa..0000000
--- a/i18n/unmaintained/no/oxygen.ts
+++ b/dev/null
@@ -1,569 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CalcDlg</name>
-    <message>
-        <source>Calculate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OxydataWidget</name>
-    <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Density</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 J</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 pm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Oxygen</name>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PSE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculations</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/parashoot.ts b/i18n/unmaintained/no/parashoot.ts
deleted file mode 100644
index 0aa33b9..0000000
--- a/i18n/unmaintained/no/parashoot.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ParaShoot</name>
-    <message>
-        <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>       GAME OVER!
-       Your Score:  %1
- Parachuters Killed: %2
-        Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/patience.ts b/i18n/unmaintained/no/patience.ts
deleted file mode 100644
index 028b87e..0000000
--- a/i18n/unmaintained/no/patience.ts
+++ b/dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CanvasCardWindow</name>
-    <message>
-        <source>Patience</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freecell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn Three Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chicane</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Harp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teeclub</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/qasteroids.ts b/i18n/unmaintained/no/qasteroids.ts
deleted file mode 100644
index 7066645..0000000
--- a/i18n/unmaintained/no/qasteroids.ts
+++ b/dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KAstTopLevel</name>
-    <message>
-        <source>Asteroids</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ships</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fuel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ship Destroyed.
-Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over.
-Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/qcop.ts b/i18n/unmaintained/no/qcop.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/no/qcop.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/no/qpdf.ts b/i18n/unmaintained/no/qpdf.ts
deleted file mode 100644
index 2f03c32..0000000
--- a/i18n/unmaintained/no/qpdf.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPdfDlg</name>
-    <message>
-        <source>QPdf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>125%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/qpe.ts b/i18n/unmaintained/no/qpe.ts
deleted file mode 100644
index 87b424d..0000000
--- a/i18n/unmaintained/no/qpe.ts
+++ b/dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownImpl</name>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncAuthentication</name>
-    <message>
-        <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncDialog</name>
-    <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/remote.ts b/i18n/unmaintained/no/remote.ts
deleted file mode 100644
index 0314a85..0000000
--- a/i18n/unmaintained/no/remote.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainView</name>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/rotation.ts b/i18n/unmaintained/no/rotation.ts
deleted file mode 100644
index 8f282b7..0000000
--- a/i18n/unmaintained/no/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/security.ts b/i18n/unmaintained/no/security.ts
deleted file mode 100644
index b9ec769..0000000
--- a/i18n/unmaintained/no/security.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/showimg.ts b/i18n/unmaintained/no/showimg.ts
deleted file mode 100644
index 8f08d9e..0000000
--- a/i18n/unmaintained/no/showimg.ts
+++ b/dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ControlsDialog</name>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageFileSelector</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageViewer</name>
-    <message>
-        <source>Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Horizontal flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vertical flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 180</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 90</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> True color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 270</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black And White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsDialogBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/snake.ts b/i18n/unmaintained/no/snake.ts
deleted file mode 100644
index d9d6107..0000000
--- a/i18n/unmaintained/no/snake.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SnakeGame</name>
-    <message>
-        <source>Snake</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SNAKE!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use the arrow keys to guide the
-snake to eat the mouse. You must not
-crash into the walls, edges or its tail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Score :    %1   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>GAME OVER!
- Your Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/sound.ts b/i18n/unmaintained/no/sound.ts
deleted file mode 100644
index 559bf2b..0000000
--- a/i18n/unmaintained/no/sound.ts
+++ b/dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SoundSettings</name>
-    <message>
-        <source>Shows icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hides icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SoundSettingsBase</name>
-    <message>
-        <source>11025</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>44100</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>16 bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vmemo Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>33075</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visual Alerts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar Icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Calender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>15</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample Rate:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Limit in seconds:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlimited</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie if needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/spreadsheet.ts b/i18n/unmaintained/no/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/unmaintained/no/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/sshkeys.ts b/i18n/unmaintained/no/sshkeys.ts
deleted file mode 100644
index 20e2db6..0000000
--- a/i18n/unmaintained/no/sshkeys.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SSHKeysApp</name>
-    <message>
-        <source>Error running ssh-add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SSHKeysBase</name>
-    <message>
-        <source>SSH Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Keys:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fingerprint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/sysinfo.ts b/i18n/unmaintained/no/sysinfo.ts
deleted file mode 100644
index c7d5112..0000000
--- a/i18n/unmaintained/no/sysinfo.ts
+++ b/dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MemoryInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Buffers (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cached (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Free (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total Memory: %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ModulesInfo</name>
-    <message>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the kernel modules currently loaded on this handheld device.
-
-Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to execute
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MountInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> : %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProcessInfo</name>
-    <message>
-        <source>PID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the processes on this handheld device.
-
-Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SystemInfo</name>
-    <message>
-        <source>System Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VersionInfo</name>
-    <message>
-        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compiled by: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Built on: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/systemtime.ts b/i18n/unmaintained/no/systemtime.ts
deleted file mode 100644
index dabf608..0000000
--- a/i18n/unmaintained/no/systemtime.ts
+++ b/dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/tableviewer.ts b/i18n/unmaintained/no/tableviewer.ts
deleted file mode 100644
index 7d41b6f..0000000
--- a/i18n/unmaintained/no/tableviewer.ts
+++ b/dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVBrowseKeyEntry</name>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVKeyEdit_gen</name>
-    <message>
-        <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVListView</name>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableViewerWindow</name>
-    <message>
-        <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not load Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/tabmanager.ts b/i18n/unmaintained/no/tabmanager.ts
deleted file mode 100644
index d544c39..0000000
--- a/i18n/unmaintained/no/tabmanager.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppEdit</name>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exec:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManager</name>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove with applications
-still in the group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManagerBase</name>
-    <message>
-        <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Wait</name>
-    <message>
-        <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/tetrix.ts b/i18n/unmaintained/no/tetrix.ts
deleted file mode 100644
index 4916eef..0000000
--- a/i18n/unmaintained/no/tetrix.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTetrix</name>
-    <message>
-        <source>Tetrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/textedit.ts b/i18n/unmaintained/no/textedit.ts
deleted file mode 100644
index d9e355a..0000000
--- a/i18n/unmaintained/no/textedit.ts
+++ b/dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextEdit</name>
-    <message>
-        <source>New</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>Save As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start with new file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.desktop File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Linked Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/tictac.ts b/i18n/unmaintained/no/tictac.ts
deleted file mode 100644
index 1e4a751..0000000
--- a/i18n/unmaintained/no/tictac.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>TicTacToe</name>
-    <message>
-        <source>Computer starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Human starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click Play to start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make your move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>It&apos;s a draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/today.ts b/i18n/unmaintained/no/today.ts
deleted file mode 100644
index 6efe1a8..0000000
--- a/i18n/unmaintained/no/today.ts
+++ b/dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Today</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please fill out the business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayBase</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayConfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>active/order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/todolist.ts b/i18n/unmaintained/no/todolist.ts
deleted file mode 100644
index ac79230..0000000
--- a/i18n/unmaintained/no/todolist.ts
+++ b/dev/null
@@ -1,443 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only over due</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Overview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Ref</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Enter Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableView</name>
-    <message>
-        <source>C.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prior.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Table View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvanced</name>
-    <message>
-        <source>State:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Postponed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finished</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>test</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintain Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Responsible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coordinating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>60 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>80 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/usermanager.ts b/i18n/unmaintained/no/usermanager.ts
deleted file mode 100644
index 282a43f..0000000
--- a/i18n/unmaintained/no/usermanager.ts
+++ b/dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserConfig</name>
-    <message>
-        <source>OPIE User Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <source>Add User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit User</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/wlansetup.ts b/i18n/unmaintained/no/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/unmaintained/no/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/no/wordgame.ts b/i18n/unmaintained/no/wordgame.ts
deleted file mode 100644
index 7b79f74..0000000
--- a/i18n/unmaintained/no/wordgame.ts
+++ b/dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Board</name>
-    <message>
-        <source>Blanks: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewGameBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AI3: Smart AI player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RulesBase</name>
-    <message>
-        <source>Game Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ScoreInfo</name>
-    <message>
-        <source>&lt;P&gt;Invalid move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Score: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WordGame</name>
-    <message>
-        <source>Word Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to end the game early?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/opie-i18n-ja.control b/i18n/unmaintained/opie-i18n-ja.control
deleted file mode 100644
index fed2631..0000000
--- a/i18n/unmaintained/opie-i18n-ja.control
+++ b/dev/null
@@ -1,11 +0,0 @@
-Package: opie-i18n-ja
-Files: i18n/ja/.directory i18n/ja/*.qm
-Priority: optional
-Section: opie/i18n
-Maintainer: Carstem Niehaus <cniehaus@kde.org>
-Architecture: arm
-Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
-Description: i18n: Japanese
- Japanese UI texts for OPIE environment.
diff --git a/i18n/unmaintained/opie-i18n-ko.control b/i18n/unmaintained/opie-i18n-ko.control
deleted file mode 100644
index 1ee5b72..0000000
--- a/i18n/unmaintained/opie-i18n-ko.control
+++ b/dev/null
@@ -1,11 +0,0 @@
-Package: opie-i18n-ko
-Files: i18n/ko/.directory i18n/ko/*.qm
-Priority: optional
-Section: opie/i18n
-Maintainer: Carstem Niehaus <cniehaus@kde.org>
-Architecture: arm
-Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
-Description: i18n: Korean
- Korean UI texts for OPIE environment.
diff --git a/i18n/unmaintained/opie-i18n-no.control b/i18n/unmaintained/opie-i18n-no.control
deleted file mode 100644
index f8324b4..0000000
--- a/i18n/unmaintained/opie-i18n-no.control
+++ b/dev/null
@@ -1,11 +0,0 @@
-Package: opie-i18n-no
-Files: i18n/no/.directory i18n/no/*.qm etc/dict/dawg.no
-Priority: optional
-Section: opie/i18n
-Maintainer: Carstem Niehaus <cniehaus@kde.org>
-Architecture: arm
-Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal
-Description: i18n: Norsk
- Norwegian UI texts and dictionary for OPIE environment.
diff --git a/i18n/unmaintained/opie-i18n-zh-cn.control b/i18n/unmaintained/opie-i18n-zh-cn.control
deleted file mode 100644
index 0614feb..0000000
--- a/i18n/unmaintained/opie-i18n-zh-cn.control
+++ b/dev/null
@@ -1,11 +0,0 @@
-Package: opie-i18n-zh-cn
-Files: i18n/zh_CN/.directory i18n/zh_CN/*.qm
-Priority: optional
-Section: opie/i18n
-Maintainer: Carstem Niehaus <cniehaus@kde.org>
-Architecture: arm
-Arch: iPAQ
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal, qpf-cyberbit-120-50-t10
-Description: i18n: Chinese
- Chinese UI texts for OPIE environment.
diff --git a/i18n/unmaintained/zh_CN/.cvsignore b/i18n/unmaintained/zh_CN/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/unmaintained/zh_CN/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/unmaintained/zh_CN/.directory b/i18n/unmaintained/zh_CN/.directory
deleted file mode 100644
index b2f034f..0000000
--- a/i18n/unmaintained/zh_CN/.directory
+++ b/dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Simplified Chinese
-Name[ja]=簡易中国語
-Name[zh_CN]=简体中文
-Name[hu]=Kínai (egyszerûsített)
-Name[pt]=Chinês Simplificado
-Name[pt_BR]=Chinês Simplificado
-Name[es]=Chino Simplificado
-Name[it]=Cinese Semplificato
-Name[sl]=Poenostavljena kitajscina
-Name[da]=Kinesisk, simpelt
diff --git a/i18n/unmaintained/zh_CN/addressbook.ts b/i18n/unmaintained/zh_CN/addressbook.ts
deleted file mode 100644
index 07e577f..0000000
--- a/i18n/unmaintained/zh_CN/addressbook.ts
+++ b/dev/null
@@ -1,1392 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AbTable</name>
-    <message>
-        <source>Full Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pick</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts - My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OContacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
-    <message>
-        <source>Query Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notice: QT-Mail is just 
-provided in the SHARP 
-default ROM. Opie-Mail 
-is provided free !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactEditor</name>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>France</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Afganistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Albania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Algeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>American Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Andorra</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Angola</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anguilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antartica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argentina</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Armania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aruba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Australia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Austria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahamas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahrain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barbados</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belarus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Benin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bermuda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bhutan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boliva</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Botswana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brazil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burundi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cambodia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Camaroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>China</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colombia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comoros</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cook Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Croatia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cuba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyprus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Denmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Djibouti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>East Timor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ecuador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Egypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>El Salvador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eritrea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fiji</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Guiana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gabon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Georgia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gahna</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greece</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greenland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Grenada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guadelupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guatemala</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea-bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guyana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Haiti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holy See</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Honduras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hungary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iceland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>India</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indonesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ireland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Israel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jamacia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jordan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kenya</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Korea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Laos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Latvia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lebanon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lesotho</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liberia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithuania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macedonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Madagascar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malawi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malaysia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maldives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mali</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Martinique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mayotte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mexico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micronesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moldova</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monaco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mongolia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Montserrat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Morocco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mozambique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Myanmar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Namibia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nauru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nepal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Netherlands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Zealand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nigeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oman</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pakistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palestinian Territory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panama</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paraguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Philippines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitcairn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Poland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portugal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reunion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Romania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Russia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rwanda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>San Marino</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Senegal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seychelles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Singapore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovakia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Somalia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>South Africa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>St. Helena</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sudan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suriname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Swaziland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sweden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switzerland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taiwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tanzania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thailand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Togo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tokelau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tonga</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunisia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uganda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ukraine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uruguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Venezuela</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Viet Nam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yemen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/advancedfm.ts b/i18n/unmaintained/zh_CN/advancedfm.ts
deleted file mode 100644
index 070ddfe..0000000
--- a/i18n/unmaintained/zh_CN/advancedfm.ts
+++ b/dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedFm</name>
-    <message>
-        <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</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>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Output</name>
-    <message>
-        <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/appearance.ts b/i18n/unmaintained/zh_CN/appearance.ts
deleted file mode 100644
index 6b7db2b..0000000
--- a/i18n/unmaintained/zh_CN/appearance.ts
+++ b/dev/null
@@ -1,266 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Appearance</name>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete current scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
-
-Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure the currently selected style.
-
-Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Window decorations control the way the application title bar and its buttons appear.
-
-Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color schemes are a collection of colors which are used for various parts of the display.
-
-Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
-
-1. Tabs - normal tabs with text labels only
-2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
-3. Drop down list - a vertical listing of tabs
-4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleWindow</name>
-    <message>
-        <source>Sample</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/appskey.ts b/i18n/unmaintained/zh_CN/appskey.ts
deleted file mode 100644
index ece7213..0000000
--- a/i18n/unmaintained/zh_CN/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/backup.ts b/i18n/unmaintained/zh_CN/backup.ts
deleted file mode 100644
index 02b6cc2..0000000
--- a/i18n/unmaintained/zh_CN/backup.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BackupAndRestore</name>
-    <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
-    <message>
-        <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/bounce.ts b/i18n/unmaintained/zh_CN/bounce.ts
deleted file mode 100644
index 9d2d3d1..0000000
--- a/i18n/unmaintained/zh_CN/bounce.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KJezzball</name>
-    <message>
-        <source>Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game paused.
-Press P to continue!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over!
-Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully cleared more than 75%.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: 15 points per life
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Bonus
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Total score
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On to level %1.
-You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/buzzword.ts b/i18n/unmaintained/zh_CN/buzzword.ts
deleted file mode 100644
index 076f679..0000000
--- a/i18n/unmaintained/zh_CN/buzzword.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BuzzWord</name>
-    <message>
-        <source>buZzword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/calculator.ts b/i18n/unmaintained/zh_CN/calculator.ts
deleted file mode 100644
index edd7e16..0000000
--- a/i18n/unmaintained/zh_CN/calculator.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calculator</name>
-    <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ln</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>tan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+/-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CalculatorImpl</name>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/checkbook.ts b/i18n/unmaintained/zh_CN/checkbook.ts
deleted file mode 100644
index 77b4422..0000000
--- a/i18n/unmaintained/zh_CN/checkbook.ts
+++ b/dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Checkbook</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transactions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIN number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all transactions entered for this checkbook.
-
-To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password protect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Num</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Configuration</name>
-    <message>
-        <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show whether checkbook is password
-protected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new checkbook.
-
-You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to edit it.
-
-You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here delete it.
-
-You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Transaction</name>
-    <message>
-        <source>Transaction for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction type here.
-
-The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/citytime.ts b/i18n/unmaintained/zh_CN/citytime.ts
deleted file mode 100644
index a250baf..0000000
--- a/i18n/unmaintained/zh_CN/citytime.ts
+++ b/dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CityTime</name>
-    <message>
-        <source>Time Changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting timezone %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CityTimeBase</name>
-    <message>
-        <source>City Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ZoneMap</name>
-    <message>
-        <source>CITY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to Find Timezone Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/clock.ts b/i18n/unmaintained/zh_CN/clock.ts
deleted file mode 100644
index d4a93dc..0000000
--- a/i18n/unmaintained/zh_CN/clock.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Clock</name>
-    <message>
-        <source>Snooze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/confedit.ts b/i18n/unmaintained/zh_CN/confedit.ts
deleted file mode 100644
index a4f440a..0000000
--- a/i18n/unmaintained/zh_CN/confedit.ts
+++ b/dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>EditWidget</name>
-    <message>
-        <source>File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewConfDir</name>
-    <message>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewItemConfFile</name>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>no group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/datebook.ts b/i18n/unmaintained/zh_CN/datebook.ts
deleted file mode 100644
index 621fcc7..0000000
--- a/i18n/unmaintained/zh_CN/datebook.ts
+++ b/dev/null
@@ -1,741 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm and Start Time...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time (dayview)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>W: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/drawpad.ts b/i18n/unmaintained/zh_CN/drawpad.ts
deleted file mode 100644
index d8b80c5..0000000
--- a/i18n/unmaintained/zh_CN/drawpad.ts
+++ b/dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/embeddedkonsole.ts b/i18n/unmaintained/zh_CN/embeddedkonsole.ts
deleted file mode 100644
index 81b9d45..0000000
--- a/i18n/unmaintained/zh_CN/embeddedkonsole.ts
+++ b/dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CommandEditDialog</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommandEditDialogBase</name>
-    <message>
-        <source>Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Konsole</name>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Yellow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Magenta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magenta on Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyan on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Cyan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amber on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ScrollBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Beep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>editCommandBase</name>
-    <message>
-        <source>Add command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter command to add:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/fifteen.ts b/i18n/unmaintained/zh_CN/fifteen.ts
deleted file mode 100644
index b52d689..0000000
--- a/i18n/unmaintained/zh_CN/fifteen.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FifteenMainWindow</name>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PiecesTable</name>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulations!
-You win the game!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;andomize Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reset Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/filebrowser.ts b/i18n/unmaintained/zh_CN/filebrowser.ts
deleted file mode 100644
index aff9a16..0000000
--- a/i18n/unmaintained/zh_CN/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/formatter.ts b/i18n/unmaintained/zh_CN/formatter.ts
deleted file mode 100644
index 751e732..0000000
--- a/i18n/unmaintained/zh_CN/formatter.ts
+++ b/dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatterApp</name>
-    <message>
-        <source>Formatter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mount Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really format
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not format.
-Unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>umount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not umount.
-Device is busy!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such device!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/go.ts b/i18n/unmaintained/zh_CN/go.ts
deleted file mode 100644
index 07e1e03..0000000
--- a/i18n/unmaintained/zh_CN/go.ts
+++ b/dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GoMainWidget</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resign</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two player option</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>GoWidget</name>
-    <message>
-        <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A draw.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/helpbrowser.ts b/i18n/unmaintained/zh_CN/helpbrowser.ts
deleted file mode 100644
index 4951556..0000000
--- a/i18n/unmaintained/zh_CN/helpbrowser.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <source>Backward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HelpBrowser</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/kbill.ts b/i18n/unmaintained/zh_CN/kbill.ts
deleted file mode 100644
index 10b6638..0000000
--- a/i18n/unmaintained/zh_CN/kbill.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KBill</name>
-    <message>
-        <source>kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UI</name>
-    <message>
-        <source>After Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your score</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/kcheckers.ts b/i18n/unmaintained/zh_CN/kcheckers.ts
deleted file mode 100644
index 01e6872..0000000
--- a/i18n/unmaintained/zh_CN/kcheckers.ts
+++ b/dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KCheckers</name>
-    <message>
-        <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> New Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Undo Move </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/keypebble.ts b/i18n/unmaintained/zh_CN/keypebble.ts
deleted file mode 100644
index 3da72e1..0000000
--- a/i18n/unmaintained/zh_CN/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/kpacman.ts b/i18n/unmaintained/zh_CN/kpacman.ts
deleted file mode 100644
index fb73268..0000000
--- a/i18n/unmaintained/zh_CN/kpacman.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keys</name>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Kpacman</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@PACKAGE@ - @VERSION@
-
-Joerg Thoennissen (joe@dsite.de)
-
-A pacman game for the KDE Desktop
-
-The program based on the source of ksnake
-by Michel Filippi (mfilippi@sade.rhein-main.de).
-The design was strongly influenced by the pacman
-(c) 1980 MIDWAY MFG.CO.
-
-I like to thank my girlfriend Elke Krueers for
-the last 10 years of her friendship.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KpacmanWidget</name>
-    <message>
-        <source>The bitfont could not be contructed.
-
-The file &apos;@FONTNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Referee</name>
-    <message>
-        <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>READY!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-POKEY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Score</name>
-    <message>
-        <source>  1UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  2UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Status</name>
-    <message>
-        <source>The pixmap could not be contructed.
-
-The file &apos;@PIXMAPNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/language.ts b/i18n/unmaintained/zh_CN/language.ts
deleted file mode 100644
index 24fd93b..0000000
--- a/i18n/unmaintained/zh_CN/language.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LanguageSettings</name>
-    <message>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>default</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageSettingsBase</name>
-    <message>
-        <source>Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select language</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libbatteryapplet-ipaq.ts b/i18n/unmaintained/zh_CN/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 523dd46..0000000
--- a/i18n/unmaintained/zh_CN/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libbatteryapplet.ts b/i18n/unmaintained/zh_CN/libbatteryapplet.ts
deleted file mode 100644
index 0f0c5ce..0000000
--- a/i18n/unmaintained/zh_CN/libbatteryapplet.ts
+++ b/dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libbend.ts b/i18n/unmaintained/zh_CN/libbend.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/zh_CN/libbend.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libcardmonapplet.ts b/i18n/unmaintained/zh_CN/libcardmonapplet.ts
deleted file mode 100644
index 441a701..0000000
--- a/i18n/unmaintained/zh_CN/libcardmonapplet.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CardMonitor</name>
-    <message>
-        <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libclipboardapplet.ts b/i18n/unmaintained/zh_CN/libclipboardapplet.ts
deleted file mode 100644
index 9b0ac97..0000000
--- a/i18n/unmaintained/zh_CN/libclipboardapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ClipboardApplet</name>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libclockapplet.ts b/i18n/unmaintained/zh_CN/libclockapplet.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/zh_CN/libclockapplet.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libdialup.ts b/i18n/unmaintained/zh_CN/libdialup.ts
deleted file mode 100644
index dbb9bc9..0000000
--- a/i18n/unmaintained/zh_CN/libdialup.ts
+++ b/dev/null
@@ -1,251 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DialupBase</name>
-    <message>
-        <source>Dial-up </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phone:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT-dial:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDT</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ATDP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4800</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demand Dialing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Idle timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic connect and disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual connect, automatic disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect name servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-detect routing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PCMCIA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PppMon</name>
-    <message>
-        <source>Waiting for activity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No carrier</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number is busy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Timed out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libhomeapplet.ts b/i18n/unmaintained/zh_CN/libhomeapplet.ts
deleted file mode 100644
index 35433b8..0000000
--- a/i18n/unmaintained/zh_CN/libhomeapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HomeApplet</name>
-    <message>
-        <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libirdaapplet.ts b/i18n/unmaintained/zh_CN/libirdaapplet.ts
deleted file mode 100644
index 1000064..0000000
--- a/i18n/unmaintained/zh_CN/libirdaapplet.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IrdaApplet</name>
-    <message>
-        <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Found:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lost:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/liblan.ts b/i18n/unmaintained/zh_CN/liblan.ts
deleted file mode 100644
index 56b0969..0000000
--- a/i18n/unmaintained/zh_CN/liblan.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Lan</name>
-    <message>
-        <source>LAN Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This name already
-exists. Please choose a
-different name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanBase</name>
-    <message>
-        <source>LAN </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify TCP/IP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Obtain TCP/IP Information Automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TCP/IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanState</name>
-    <message>
-        <source>Form2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Service:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProxiesPageBase</name>
-    <message>
-        <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto configure proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No proxies for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libliquid.ts b/i18n/unmaintained/zh_CN/libliquid.ts
deleted file mode 100644
index 410b29e..0000000
--- a/i18n/unmaintained/zh_CN/libliquid.ts
+++ b/dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSettings</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/liblogoutapplet.ts b/i18n/unmaintained/zh_CN/liblogoutapplet.ts
deleted file mode 100644
index 06cbe25..0000000
--- a/i18n/unmaintained/zh_CN/liblogoutapplet.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LogoutApplet</name>
-    <message>
-        <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to
-end this session ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libmadplugin.ts b/i18n/unmaintained/zh_CN/libmadplugin.ts
deleted file mode 100644
index 775b417..0000000
--- a/i18n/unmaintained/zh_CN/libmadplugin.ts
+++ b/dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LibMadPlugin</name>
-    <message>
-        <source>No Song Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Artist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Album</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Track: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Genre: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bitrate: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libmail.ts b/i18n/unmaintained/zh_CN/libmail.ts
deleted file mode 100644
index 78c7198..0000000
--- a/i18n/unmaintained/zh_CN/libmail.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MailFactory</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t attach file &apos;%1&apos;. Continue anyway or abort?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SmtpHandler</name>
-    <message>
-        <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server refused the connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host lookup failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The read from the socket failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The sending failed for an unknown reason.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP &gt; %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; EHLO *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; AUTH CRAM-MD5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; Authenticating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; HELO *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; MAIL FROM: *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; RCPT TO: *</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; DATA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; Sending data...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP&gt; QUIT (Done)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server returned an error. This is the message:&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP &lt; %3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libmetal.ts b/i18n/unmaintained/zh_CN/libmetal.ts
deleted file mode 100644
index b82c564..0000000
--- a/i18n/unmaintained/zh_CN/libmetal.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Metal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libmpeg3plugin.ts b/i18n/unmaintained/zh_CN/libmpeg3plugin.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/zh_CN/libmpeg3plugin.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libnetmonapplet.ts b/i18n/unmaintained/zh_CN/libnetmonapplet.ts
deleted file mode 100644
index 8d174c3..0000000
--- a/i18n/unmaintained/zh_CN/libnetmonapplet.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NetMonitor</name>
-    <message>
-        <source>Network Offline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetPassword</name>
-    <message>
-        <source>Network Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password for %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libopie.ts b/i18n/unmaintained/zh_CN/libopie.ts
deleted file mode 100644
index cbaa47b..0000000
--- a/i18n/unmaintained/zh_CN/libopie.ts
+++ b/dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ORecurranceBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>TimePicker</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>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libopieobex.ts b/i18n/unmaintained/zh_CN/libopieobex.ts
deleted file mode 100644
index 99d06ec..0000000
--- a/i18n/unmaintained/zh_CN/libopieobex.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqdvorak.ts b/i18n/unmaintained/zh_CN/libqdvorak.ts
deleted file mode 100644
index 5e1ab53..0000000
--- a/i18n/unmaintained/zh_CN/libqdvorak.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqhandwriting.ts b/i18n/unmaintained/zh_CN/libqhandwriting.ts
deleted file mode 100644
index 20ed59b..0000000
--- a/i18n/unmaintained/zh_CN/libqhandwriting.ts
+++ b/dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HandwritingHelp</name>
-    <message>
-        <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HandwritingTrainer</name>
-    <message>
-        <source>Matched: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Similar to: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No match</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenEdit</name>
-    <message>
-        <source>New...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInput</name>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInputCharDlg</name>
-    <message>
-        <source>Enter new character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenPrefBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenSetup</name>
-    <message>
-        <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Customize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqjumpx.ts b/i18n/unmaintained/zh_CN/libqjumpx.ts
deleted file mode 100644
index 80ea414..0000000
--- a/i18n/unmaintained/zh_CN/libqjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqkeyboard.ts b/i18n/unmaintained/zh_CN/libqkeyboard.ts
deleted file mode 100644
index 318758e..0000000
--- a/i18n/unmaintained/zh_CN/libqkeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqkjumpx.ts b/i18n/unmaintained/zh_CN/libqkjumpx.ts
deleted file mode 100644
index 964d5dc..0000000
--- a/i18n/unmaintained/zh_CN/libqkjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqmultikey.ts b/i18n/unmaintained/zh_CN/libqmultikey.ts
deleted file mode 100644
index d1d7b71..0000000
--- a/i18n/unmaintained/zh_CN/libqmultikey.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Multikey Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keymap File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Pressed Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Multikey</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqpe.ts b/i18n/unmaintained/zh_CN/libqpe.ts
deleted file mode 100644
index 4421779..0000000
--- a/i18n/unmaintained/zh_CN/libqpe.ts
+++ b/dev/null
@@ -1,890 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</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>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqpickboard.ts b/i18n/unmaintained/zh_CN/libqpickboard.ts
deleted file mode 100644
index 488fb8f..0000000
--- a/i18n/unmaintained/zh_CN/libqpickboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libqunikeyboard.ts b/i18n/unmaintained/zh_CN/libqunikeyboard.ts
deleted file mode 100644
index 6966daa..0000000
--- a/i18n/unmaintained/zh_CN/libqunikeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libscreenshotapplet.ts b/i18n/unmaintained/zh_CN/libscreenshotapplet.ts
deleted file mode 100644
index 057c267..0000000
--- a/i18n/unmaintained/zh_CN/libscreenshotapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ScreenshotControl</name>
-    <message>
-        <source>Snapshot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>scap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libsdmonapplet.ts b/i18n/unmaintained/zh_CN/libsdmonapplet.ts
deleted file mode 100644
index 11c0c2a..0000000
--- a/i18n/unmaintained/zh_CN/libsdmonapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SdMonitor</name>
-    <message>
-        <source>Eject card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SdMonitor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libsuspendapplet.ts b/i18n/unmaintained/zh_CN/libsuspendapplet.ts
deleted file mode 100644
index bdfb04c..0000000
--- a/i18n/unmaintained/zh_CN/libsuspendapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SuspendApplet</name>
-    <message>
-        <source>Suspend shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libtheme.ts b/i18n/unmaintained/zh_CN/libtheme.ts
deleted file mode 100644
index 53a4018..0000000
--- a/i18n/unmaintained/zh_CN/libtheme.ts
+++ b/dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Themed style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KDE2 theme compatible style engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThemeSettings</name>
-    <message>
-        <source>Theme Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the theme to be used</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[No theme]</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libvmemoapplet.ts b/i18n/unmaintained/zh_CN/libvmemoapplet.ts
deleted file mode 100644
index 8371675..0000000
--- a/i18n/unmaintained/zh_CN/libvmemoapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VMemo</name>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>error recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libvolumeapplet.ts b/i18n/unmaintained/zh_CN/libvolumeapplet.ts
deleted file mode 100644
index fbb6fb9..0000000
--- a/i18n/unmaintained/zh_CN/libvolumeapplet.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>VolumeControl</name>
-    <message>
-        <source>Enable Sounds for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Clicks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screen Taps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/libwirelessapplet.ts b/i18n/unmaintained/zh_CN/libwirelessapplet.ts
deleted file mode 100644
index cdfb61d..0000000
--- a/i18n/unmaintained/zh_CN/libwirelessapplet.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedConfigBase</name>
-    <message>
-        <source>Advanced Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renew DHCP on changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MODE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AccessPoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/light-and-power.ts b/i18n/unmaintained/zh_CN/light-and-power.ts
deleted file mode 100644
index 0deb0b7..0000000
--- a/i18n/unmaintained/zh_CN/light-and-power.ts
+++ b/dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibration</name>
-    <message>
-        <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LightSettingsBase</name>
-    <message>
-        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dim light after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light off after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on Battery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on AC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warnings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SensorBase</name>
-    <message>
-        <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/liquid-settings.ts b/i18n/unmaintained/zh_CN/liquid-settings.ts
deleted file mode 100644
index b3b6a59..0000000
--- a/i18n/unmaintained/zh_CN/liquid-settings.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LiquidSet</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/mail.ts b/i18n/unmaintained/zh_CN/mail.ts
deleted file mode 100644
index d251908..0000000
--- a/i18n/unmaintained/zh_CN/mail.ts
+++ b/dev/null
@@ -1,903 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AccountEditor</name>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AccountEditorBase</name>
-    <message>
-        <source>Account Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Port:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;IMAP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[--]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;SMTP:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;User:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Pass:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;E-Mail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Org:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bcc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply-To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IMAP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use SSL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>993</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressPicker</name>
-    <message>
-        <source>There are no entries in the addressbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressPickerBase</name>
-    <message>
-        <source>Address Picker</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please select an entry first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1&lt;/p</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The queued mails </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> of </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ComposerBase</name>
-    <message>
-        <source>Compose Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attach a file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bcc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subj.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prio.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add an Attachement</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Attachement</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDiag</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Question</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDiagBase</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[Hidden]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail notification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blink LED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play sound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Check&amp;nbsp;every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> min</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable mail notification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
-Sponsored and Programmed by LISAsystems&lt;br&gt;
-Visit http://www.lisa.de/ for Information.
-                            </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FolderWidget</name>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan folder list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Question</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foldername</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to host.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Renaming successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deletion successfull!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder created. Rescanning...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Got folder list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailTable</name>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unseen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Marked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unmarked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mark as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailbox contained no mails.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Getting mail headers...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopped</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Got all mail headers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindowBase</name>
-    <message>
-        <source>E-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose new mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send queued mails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show/hide folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search mails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenDiagBase</name>
-    <message>
-        <source>Open file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Stop </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>[Icon]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;i&gt;application/v-card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open using an application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save to disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>(no name)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;Foldertree not known.&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no from)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no subject)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no date)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RenameBase</name>
-    <message>
-        <source>Renaming</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;Renaming</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;div align=center&gt;to</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchDiag</name>
-    <message>
-        <source>Body</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Header Field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Results</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Search failed. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchDiagBase</name>
-    <message>
-        <source>Mail Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;For:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewMail</name>
-    <message>
-        <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no subject)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no from)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no recipient)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(no date)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Getting mail body from server. Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewMailBase</name>
-    <message>
-        <source>E-Mail by %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/mediummount.ts b/i18n/unmaintained/zh_CN/mediummount.ts
deleted file mode 100644
index dba8eda..0000000
--- a/i18n/unmaintained/zh_CN/mediummount.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/mindbreaker.ts b/i18n/unmaintained/zh_CN/mindbreaker.ts
deleted file mode 100644
index 598d561..0000000
--- a/i18n/unmaintained/zh_CN/mindbreaker.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MindBreaker</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MindBreakerBoard</name>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/minesweep.ts b/i18n/unmaintained/zh_CN/minesweep.ts
deleted file mode 100644
index 1dd7e7f..0000000
--- a/i18n/unmaintained/zh_CN/minesweep.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MineSweep</name>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You exploded!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/mobilemsg.ts b/i18n/unmaintained/zh_CN/mobilemsg.ts
deleted file mode 100644
index b5f8b20..0000000
--- a/i18n/unmaintained/zh_CN/mobilemsg.ts
+++ b/dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MobileMsgBase</name>
-    <message>
-        <source>Mobile Messaging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flash</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unicode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMS: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nokia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/mpegplayer.ts b/i18n/unmaintained/zh_CN/mpegplayer.ts
deleted file mode 100644
index 8f56766..0000000
--- a/i18n/unmaintained/zh_CN/mpegplayer.ts
+++ b/dev/null
@@ -1,225 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is all ready in your playlist.
-Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/netsetup.ts b/i18n/unmaintained/zh_CN/netsetup.ts
deleted file mode 100644
index 2c17b1b..0000000
--- a/i18n/unmaintained/zh_CN/netsetup.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddNetworkSettingBase</name>
-    <message>
-        <source>Add Network Service</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services available to be added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettings</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Only one %1 can be added. Remove the current one, or change its Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkSettingsBase</name>
-    <message>
-        <source>Network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;This is the state of your running network services.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;These are the network services you currently have available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/oipkg.ts b/i18n/unmaintained/zh_CN/oipkg.ts
deleted file mode 100644
index 210f5d3..0000000
--- a/i18n/unmaintained/zh_CN/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opie-login.ts b/i18n/unmaintained/zh_CN/opie-login.ts
deleted file mode 100644
index 42551e6..0000000
--- a/i18n/unmaintained/zh_CN/opie-login.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindow</name>
-    <message>
-        <source>Login</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LoginWindowImpl</name>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrong password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OPIE was terminated
-by an uncaught signal
-(%1)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start OPIE.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opie-sh.ts b/i18n/unmaintained/zh_CN/opie-sh.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/zh_CN/opie-sh.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opie-sheet.ts b/i18n/unmaintained/zh_CN/opie-sheet.ts
deleted file mode 100644
index 299ca20..0000000
--- a/i18n/unmaintained/zh_CN/opie-sheet.ts
+++ b/dev/null
@@ -1,815 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help file not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opieftp.ts b/i18n/unmaintained/zh_CN/opieftp.ts
deleted file mode 100644
index 4d84121..0000000
--- a/i18n/unmaintained/zh_CN/opieftp.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OpieFtp</name>
-    <message>
-        <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</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>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ftp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to connect to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to log in
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to upload
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to download 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to list the directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to change directories
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to cd up
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to get working dir
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to make directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to remove directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to rename file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Server name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opiemail.ts b/i18n/unmaintained/zh_CN/opiemail.ts
deleted file mode 100644
index efb9e76..0000000
--- a/i18n/unmaintained/zh_CN/opiemail.ts
+++ b/dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/opieplayer.ts b/i18n/unmaintained/zh_CN/opieplayer.ts
deleted file mode 100644
index b8f82ba..0000000
--- a/i18n/unmaintained/zh_CN/opieplayer.ts
+++ b/dev/null
@@ -1,268 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioDevice</name>
-    <message>
-        <source>Somethin&apos;s wrong with
-your sound device.
-open(&quot;/dev/dsp&quot;)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-
-Closing player now.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>No file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: There is no file selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The following file was not found: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No decoder found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem saving the playlist.
-Your playlist may be missing some entries
-the next time you start it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/oxygen.ts b/i18n/unmaintained/zh_CN/oxygen.ts
deleted file mode 100644
index 4f674fa..0000000
--- a/i18n/unmaintained/zh_CN/oxygen.ts
+++ b/dev/null
@@ -1,569 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CalcDlg</name>
-    <message>
-        <source>Calculate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OxydataWidget</name>
-    <message>
-        <source>Weight:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Density</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 J</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 pm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Oxygen</name>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PSE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculations</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/parashoot.ts b/i18n/unmaintained/zh_CN/parashoot.ts
deleted file mode 100644
index 0aa33b9..0000000
--- a/i18n/unmaintained/zh_CN/parashoot.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ParaShoot</name>
-    <message>
-        <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>       GAME OVER!
-       Your Score:  %1
- Parachuters Killed: %2
-        Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/patience.ts b/i18n/unmaintained/zh_CN/patience.ts
deleted file mode 100644
index 028b87e..0000000
--- a/i18n/unmaintained/zh_CN/patience.ts
+++ b/dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CanvasCardWindow</name>
-    <message>
-        <source>Patience</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freecell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Card Backs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turn Three Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chicane</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Harp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Teeclub</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/qasteroids.ts b/i18n/unmaintained/zh_CN/qasteroids.ts
deleted file mode 100644
index 7066645..0000000
--- a/i18n/unmaintained/zh_CN/qasteroids.ts
+++ b/dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KAstTopLevel</name>
-    <message>
-        <source>Asteroids</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ships</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fuel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ship Destroyed.
-Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over.
-Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/qcop.ts b/i18n/unmaintained/zh_CN/qcop.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/unmaintained/zh_CN/qcop.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/qpdf.ts b/i18n/unmaintained/zh_CN/qpdf.ts
deleted file mode 100644
index 2f03c32..0000000
--- a/i18n/unmaintained/zh_CN/qpdf.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPdfDlg</name>
-    <message>
-        <source>QPdf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>125%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/qpe.ts b/i18n/unmaintained/zh_CN/qpe.ts
deleted file mode 100644
index 87b424d..0000000
--- a/i18n/unmaintained/zh_CN/qpe.ts
+++ b/dev/null
@@ -1,244 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownImpl</name>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncAuthentication</name>
-    <message>
-        <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncDialog</name>
-    <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/remote.ts b/i18n/unmaintained/zh_CN/remote.ts
deleted file mode 100644
index 0314a85..0000000
--- a/i18n/unmaintained/zh_CN/remote.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainView</name>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/rotation.ts b/i18n/unmaintained/zh_CN/rotation.ts
deleted file mode 100644
index 8f282b7..0000000
--- a/i18n/unmaintained/zh_CN/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/security.ts b/i18n/unmaintained/zh_CN/security.ts
deleted file mode 100644
index b9ec769..0000000
--- a/i18n/unmaintained/zh_CN/security.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/showimg.ts b/i18n/unmaintained/zh_CN/showimg.ts
deleted file mode 100644
index 8f08d9e..0000000
--- a/i18n/unmaintained/zh_CN/showimg.ts
+++ b/dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ControlsDialog</name>
-    <message>
-        <source>Brightness</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageFileSelector</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImageViewer</name>
-    <message>
-        <source>Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Horizontal flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vertical flip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 180</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 90</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Image Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> True color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate 270</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black And White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsDialogBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slide Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/snake.ts b/i18n/unmaintained/zh_CN/snake.ts
deleted file mode 100644
index d9d6107..0000000
--- a/i18n/unmaintained/zh_CN/snake.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SnakeGame</name>
-    <message>
-        <source>Snake</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SNAKE!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use the arrow keys to guide the
-snake to eat the mouse. You must not
-crash into the walls, edges or its tail.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key To Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Score :    %1   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>GAME OVER!
- Your Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/sound.ts b/i18n/unmaintained/zh_CN/sound.ts
deleted file mode 100644
index 559bf2b..0000000
--- a/i18n/unmaintained/zh_CN/sound.ts
+++ b/dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SoundSettings</name>
-    <message>
-        <source>Shows icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hides icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SoundSettingsBase</name>
-    <message>
-        <source>11025</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>44100</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stereo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>16 bit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vmemo Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>33075</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visual Alerts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar Icon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Calender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>15</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample Rate:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recording Limit in seconds:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unlimited</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie if needed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key_Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/spreadsheet.ts b/i18n/unmaintained/zh_CN/spreadsheet.ts
deleted file mode 100644
index 52373e7..0000000
--- a/i18n/unmaintained/zh_CN/spreadsheet.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>PIMSpreadsheetWindow</name>
-    <message>
-        <source>Spreadsheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SpreadsheetWidget</name>
-    <message>
-        <source>SpreadsheetWidget</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/sshkeys.ts b/i18n/unmaintained/zh_CN/sshkeys.ts
deleted file mode 100644
index 20e2db6..0000000
--- a/i18n/unmaintained/zh_CN/sshkeys.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>SSHKeysApp</name>
-    <message>
-        <source>Error running ssh-add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SSHKeysBase</name>
-    <message>
-        <source>SSH Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Keys:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fingerprint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/sysinfo.ts b/i18n/unmaintained/zh_CN/sysinfo.ts
deleted file mode 100644
index c7d5112..0000000
--- a/i18n/unmaintained/zh_CN/sysinfo.ts
+++ b/dev/null
@@ -1,302 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LoadInfo</name>
-    <message>
-        <source>Application CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System CPU usage (%)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MemoryInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Buffers (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cached (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Free (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total Memory: %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ModulesInfo</name>
-    <message>
-        <source>Module</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use#</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the kernel modules currently loaded on this handheld device.
-
-Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to execute
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MountInfo</name>
-    <message>
-        <source>Used (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available (%1 kB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> : %1 kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProcessInfo</name>
-    <message>
-        <source>PID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a list of all the processes on this handheld device.
-
-Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to send
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SystemInfo</name>
-    <message>
-        <source>System Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CPU</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Process</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VersionInfo</name>
-    <message>
-        <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compiled by: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Built on: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/systemtime.ts b/i18n/unmaintained/zh_CN/systemtime.ts
deleted file mode 100644
index dabf608..0000000
--- a/i18n/unmaintained/zh_CN/systemtime.ts
+++ b/dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/tableviewer.ts b/i18n/unmaintained/zh_CN/tableviewer.ts
deleted file mode 100644
index 7d41b6f..0000000
--- a/i18n/unmaintained/zh_CN/tableviewer.ts
+++ b/dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVBrowseKeyEntry</name>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVKeyEdit_gen</name>
-    <message>
-        <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TVListView</name>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableViewerWindow</name>
-    <message>
-        <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not load Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/tabmanager.ts b/i18n/unmaintained/zh_CN/tabmanager.ts
deleted file mode 100644
index d544c39..0000000
--- a/i18n/unmaintained/zh_CN/tabmanager.ts
+++ b/dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppEdit</name>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exec:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManager</name>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove with applications
-still in the group.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabManagerBase</name>
-    <message>
-        <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Wait</name>
-    <message>
-        <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/tetrix.ts b/i18n/unmaintained/zh_CN/tetrix.ts
deleted file mode 100644
index 4916eef..0000000
--- a/i18n/unmaintained/zh_CN/tetrix.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTetrix</name>
-    <message>
-        <source>Tetrix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/textedit.ts b/i18n/unmaintained/zh_CN/textedit.ts
deleted file mode 100644
index d9e355a..0000000
--- a/i18n/unmaintained/zh_CN/textedit.ts
+++ b/dev/null
@@ -1,248 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextEdit</name>
-    <message>
-        <source>New</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>Save As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap lines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start with new file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.desktop File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Linked Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no user</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error setting mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/tictac.ts b/i18n/unmaintained/zh_CN/tictac.ts
deleted file mode 100644
index 1e4a751..0000000
--- a/i18n/unmaintained/zh_CN/tictac.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>TicTacToe</name>
-    <message>
-        <source>Computer starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Human starts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click Play to start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make your move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>It&apos;s a draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/today.ts b/i18n/unmaintained/zh_CN/today.ts
deleted file mode 100644
index 6efe1a8..0000000
--- a/i18n/unmaintained/zh_CN/today.ts
+++ b/dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Today</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owned by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please fill out the business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayBase</name>
-    <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today by Maximilian Rei&#xdf;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodayConfig</name>
-    <message>
-        <source>Today config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>active/order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/todolist.ts b/i18n/unmaintained/zh_CN/todolist.ts
deleted file mode 100644
index ac79230..0000000
--- a/i18n/unmaintained/zh_CN/todolist.ts
+++ b/dev/null
@@ -1,443 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>New Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only over due</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New from template</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo was unable
-to save your changes.
-Free up some space
-and try again.
-
-Quit Anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Todo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
-    <message>
-        <source>Overview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reminders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Ref</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Enter Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TableView</name>
-    <message>
-        <source>C.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prior.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deadline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Table View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvanced</name>
-    <message>
-        <source>State:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Postponed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finished</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not started</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>test</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maintain Mode:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Responsible</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Coordinating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
-    <message>
-        <source>empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Priority</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 - Very High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 - High</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 - Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 - Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5 - Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>20 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>60 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>80 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100 %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Due Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2002</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Januar 2001</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>work on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>buy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>organize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>get</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Recurrance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
-    <message>
-        <source>Todo List</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
-    <message>
-        <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/usermanager.ts b/i18n/unmaintained/zh_CN/usermanager.ts
deleted file mode 100644
index 282a43f..0000000
--- a/i18n/unmaintained/zh_CN/usermanager.ts
+++ b/dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GroupDialog</name>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserConfig</name>
-    <message>
-        <source>OPIE User Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UserDialog</name>
-    <message>
-        <source>Add User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit User</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/wlansetup.ts b/i18n/unmaintained/zh_CN/wlansetup.ts
deleted file mode 100644
index b2f4b3d..0000000
--- a/i18n/unmaintained/zh_CN/wlansetup.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>WLAN</name>
-    <message>
-        <source>Wireless LAN Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ESS ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Non-Spec ESSID: &quot;ANY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specific ESSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Network Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>802.11 Ad-Hoc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Setting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key 4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>40 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>128 Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Authentication Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open System</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shared Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Wep</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/unmaintained/zh_CN/wordgame.ts b/i18n/unmaintained/zh_CN/wordgame.ts
deleted file mode 100644
index 7b79f74..0000000
--- a/i18n/unmaintained/zh_CN/wordgame.ts
+++ b/dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Board</name>
-    <message>
-        <source>Blanks: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ignore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewGameBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Players</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AI3: Smart AI player</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RulesBase</name>
-    <message>
-        <source>Game Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ScoreInfo</name>
-    <message>
-        <source>&lt;P&gt;Invalid move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Score: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WordGame</name>
-    <message>
-        <source>Word Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to end the game early?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/.directory b/i18n/xx/.directory
index 4a299fe..3a48db7 100644
--- a/i18n/xx/.directory
+++ b/i18n/xx/.directory
@@ -1,2 +1,5 @@
 [Desktop Entry]
 Name=i18n-test
+Name[de]=Testsprache
+Name[it]=Test i18n
+Naam[nl]=Testtaal
\ No newline at end of file
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 9256276..3a4c014 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -1,920 +1,919 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Search</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Import vCard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save all Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
+        <source>Unable to find a contact for this search pattern!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Export vCard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moveable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Full Name...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Albania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Angola</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Australia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Austria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Belize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Benin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>China</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Congo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>France</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greece</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>India</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Israel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Italy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Korea</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Kuwait</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Laos</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macau</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mali</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Malta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index cd29ac2..43e7e04 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -1,304 +1,360 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add To Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Could not rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really copy
 %1 files?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
         <translation>FOO</translation>
     </message>
     <message>
+        <source>Bookmark Directory</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
         <source>Cannot remove current directory
 from bookmarks.
-It is not bookmarked!!</source>
+It is not bookmarked!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Bookmark Directory</source>
+        <source>File Search</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Remove Current Directory from Bookmarks</source>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Error</source>
+        <source>Really delete
+%1?</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Copy &apos;%1&apos; As</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>read</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>write</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/appskey.ts b/i18n/xx/appskey.ts
deleted file mode 100644
index 74b4142..0000000
--- a/i18n/xx/appskey.ts
+++ b/dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppsKeyApp</name>
-    <message>
-        <source>Set Application Key</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Address Book</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Popup Menu</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/aqpkg.ts b/i18n/xx/aqpkg.ts
index fa891d8..915fde1 100644
--- a/i18n/xx/aqpkg.ts
+++ b/i18n/xx/aqpkg.ts
@@ -1,546 +1,674 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Install
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space Avail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information Level</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Errors only</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Informative messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>R</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>U</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Package Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
+    <message>
+        <source>Remove</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Address:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Active Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Destination</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Link to root</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Username:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password:</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/backgammon.ts b/i18n/xx/backgammon.ts
index 4eb9e18..a548cfc 100644
--- a/i18n/xx/backgammon.ts
+++ b/i18n/xx/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation>FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/backup.ts b/i18n/xx/backup.ts
index 96cb226..ac81034 100644
--- a/i18n/xx/backup.ts
+++ b/i18n/xx/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/bounce.ts b/i18n/xx/bounce.ts
index 49af324..9f5a24c 100644
--- a/i18n/xx/bounce.ts
+++ b/i18n/xx/bounce.ts
@@ -1,100 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/calibrate.ts b/i18n/xx/calibrate.ts
new file mode 100644
index 0000000..4aedc35
--- a/dev/null
+++ b/i18n/xx/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/checkbook.ts b/i18n/xx/checkbook.ts
index 4ce1e61..532f102 100644
--- a/i18n/xx/checkbook.ts
+++ b/i18n/xx/checkbook.ts
@@ -1,505 +1,509 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Savings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Checking</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CD</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Money market</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Other</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bills</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CDs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Computer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Eletronics</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Entertainment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Food</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Movies</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/clock.ts b/i18n/xx/clock.ts
index e05ff5e..1a93467 100644
--- a/i18n/xx/clock.ts
+++ b/i18n/xx/clock.ts
@@ -1,93 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 6ec4651..1ef712c 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -1,804 +1,831 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>T</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>W</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>F</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Views</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default view:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jump to current time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time display</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
+        <source>p</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Mo</source>
+        <comment>Monday</comment>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>days</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>months</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>years</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/drawpad.ts b/i18n/xx/drawpad.ts
index 64acfb4..47d6b6d 100644
--- a/i18n/xx/drawpad.ts
+++ b/i18n/xx/drawpad.ts
@@ -1,435 +1,443 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>DrawPad - Export</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Page Selection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>DrawPad - Import</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automatic preview</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date: %1</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/embeddedkonsole.ts b/i18n/xx/embeddedkonsole.ts
index 535fa38..938294a 100644
--- a/i18n/xx/embeddedkonsole.ts
+++ b/i18n/xx/embeddedkonsole.ts
@@ -1,217 +1,237 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>new</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>delete</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>up</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>down</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black on Transparent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black on Red</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Red on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Green on Yellow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cyan on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Cyan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ScrollBar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide Command List</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>editCommandBase</name>
     <message>
         <source>Add command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter command to add:</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/euroconv.ts b/i18n/xx/euroconv.ts
index 4eb9e18..df22bd2 100644
--- a/i18n/xx/euroconv.ts
+++ b/i18n/xx/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation>FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/filebrowser.ts b/i18n/xx/filebrowser.ts
deleted file mode 100644
index 56837c8..0000000
--- a/i18n/xx/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/formatter.ts b/i18n/xx/formatter.ts
index 6183b8c..53f97fe 100644
--- a/i18n/xx/formatter.ts
+++ b/i18n/xx/formatter.ts
@@ -1,161 +1,201 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/helpbrowser.ts b/i18n/xx/helpbrowser.ts
index 3cf5e26..695f787 100644
--- a/i18n/xx/helpbrowser.ts
+++ b/i18n/xx/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
+        <source>Go</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/kpacman.ts b/i18n/xx/kpacman.ts
index feb59f9..ef1652a 100644
--- a/i18n/xx/kpacman.ts
+++ b/i18n/xx/kpacman.ts
@@ -1,232 +1,227 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
+        <source>KPacman</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>                          </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/launchersettings.ts b/i18n/xx/launchersettings.ts
index 0625a96..146d1d4 100644
--- a/i18n/xx/launchersettings.ts
+++ b/i18n/xx/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libfreetypefactory.ts b/i18n/xx/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/sl/libfreetypefactory.ts
+++ b/i18n/xx/lib.ts
diff --git a/i18n/xx/libbatteryapplet-ipaq.ts b/i18n/xx/libbatteryapplet-ipaq.ts
deleted file mode 100644
index 08bc9f5..0000000
--- a/i18n/xx/libbatteryapplet-ipaq.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status for Ipaq</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/libclockapplet.ts b/i18n/xx/libclockapplet.ts
index 4eb9e18..d1c32a9 100644
--- a/i18n/xx/libclockapplet.ts
+++ b/i18n/xx/libclockapplet.ts
@@ -1,2 +1,14 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+    <message>
+        <source>Information</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libflatstyle.ts b/i18n/xx/libflatstyle.ts
index 4eb9e18..77e606d 100644
--- a/i18n/xx/libflatstyle.ts
+++ b/i18n/xx/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation>FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libfreetypefactory.ts b/i18n/xx/libfreetypefactory.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/xx/libfreetypefactory.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/xx/libinterfaces.ts b/i18n/xx/libinterfaces.ts
index 17a604b..a99ccce 100644
--- a/i18n/xx/libinterfaces.ts
+++ b/i18n/xx/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>eth0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Interface</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished">FOO {255.255.255.0?}</translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libkeyview.ts b/i18n/xx/libkeyview.ts
deleted file mode 100644
index e7c1e7d..0000000
--- a/i18n/xx/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/libkppp.ts b/i18n/xx/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/xx/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libmpeg3plugin.ts b/i18n/xx/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/sl/libmpeg3plugin.ts
+++ b/i18n/xx/libmodplugin.ts
diff --git a/i18n/xx/libmpeg3plugin.ts b/i18n/xx/libmpeg3plugin.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/xx/libmpeg3plugin.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/xx/libopie.ts b/i18n/xx/libopie.ts
index 27b1a61..d1146b3 100644
--- a/i18n/xx/libopie.ts
+++ b/i18n/xx/libopie.ts
@@ -1,108 +1,674 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OFileViewFileListView</name>
+    <message>
+        <source>Name</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mime Type</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>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>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Day</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description:</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>The %1 %1 of every</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation>FOO</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libopieobex.ts b/i18n/xx/libopieobex.ts
index 8f354b5..70e6d6d 100644
--- a/i18n/xx/libopieobex.ts
+++ b/i18n/xx/libopieobex.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OtherHandler</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>SendWidget</name>
+    <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Done</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Try %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 02575ca..49fb921 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -1,886 +1,944 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>3</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>D</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>M</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
  %1?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
+        <source>Click to close this window, discarding changes.</source>
         <translation>FOO</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
+        <source>Click to close this window.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>What&apos;s this...</source>
+        <source>Click to close this window and apply changes.</source>
         <translation>FOO</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
+        <source>Click to make this window moveable.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
+        <source>Click to make this window use all available screen area.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
+        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
+        <source>What&apos;s this...</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Jan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Feb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodayaddressbookplugin.ts b/i18n/xx/libtodayaddressbookplugin.ts
index e6b0bbe..9867230 100644
--- a/i18n/xx/libtodayaddressbookplugin.ts
+++ b/i18n/xx/libtodayaddressbookplugin.ts
@@ -1,93 +1,93 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodaydatebookplugin.ts b/i18n/xx/libtodaydatebookplugin.ts
index 789a7af..524b0ce 100644
--- a/i18n/xx/libtodaydatebookplugin.ts
+++ b/i18n/xx/libtodaydatebookplugin.ts
@@ -1,83 +1,142 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>note</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
     <message>
         <source>Show location</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show notes</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Show only later
  appointments</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should be 
 shown?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How many more days</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> day(s)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>only today</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show location</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Check this if the location of an appointment should be shown for each one</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Show notes</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Check this if the note attached to an appointment should be shown for each one</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Show only later appointments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if only appointments later then current time should be shown</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Show time in extra line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many appointments should be shown maximal. In chronical order</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>How many appointment should be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>only today</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>How many more days should be in the range</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>How many more days</source>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libtodaytodolistplugin.ts b/i18n/xx/libtodaytodolistplugin.ts
index 14c55ac..3819402 100644
--- a/i18n/xx/libtodaytodolistplugin.ts
+++ b/i18n/xx/libtodaytodolistplugin.ts
@@ -1,40 +1,59 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>TodoPluginConfigBase</name>
+    <message>
+        <source>Set the maximum number of task that should be shown</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>tasks shown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>After how many chars should be the info about the task be cut off</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Clip line after X chars</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
     <name>TodolistPluginConfig</name>
     <message>
         <source>tasks shown </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Set the maximum number of task that should be shown</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/unmaintained/ja/libclockapplet.ts b/i18n/xx/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/libclockapplet.ts
+++ b/i18n/xx/libtremorplugin.ts
diff --git a/i18n/xx/libwlan.ts b/i18n/xx/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/xx/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libwlanplugin.ts b/i18n/xx/libwlanplugin.ts
new file mode 100644
index 0000000..1424287
--- a/dev/null
+++ b/i18n/xx/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/mailit.ts b/i18n/xx/mailit.ts
index 7d0b588..90d63e6 100644
--- a/i18n/xx/mailit.ts
+++ b/i18n/xx/mailit.ts
@@ -1,531 +1,613 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>attach...</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Email</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP username</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>POP server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compose</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>From</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subject</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>getMail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>select account</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>No account associated</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Examine mail</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Central view area</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mailit</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> new messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previous</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>reply</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>reply to mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Reply all</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> messages</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CC:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attachment</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>No recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>OK
 </source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source> wrote on </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source> starts======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/mediummount.ts b/i18n/xx/mediummount.ts
index 50045e1..24e9349 100644
--- a/i18n/xx/mediummount.ts
+++ b/i18n/xx/mediummount.ts
@@ -1,95 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
     <message>
-        <source>Global</source>
+        <source>Medium Mount Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Medium Mount Settings</source>
+        <source>Global</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation>FOO</translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use global settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>MediumMountSetting::MediumMountWidget</name>
     <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>FOO</translation>
     </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
     <message>
         <source>Which media files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Limit search to:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation>FOO</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/xx/networksettings.ts b/i18n/xx/networksettings.ts
index 9845c9f..b8cd9d6 100644
--- a/i18n/xx/networksettings.ts
+++ b/i18n/xx/networksettings.ts
@@ -1,88 +1,135 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>s</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>t</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Information</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/null_all.sh b/i18n/xx/null_all.sh
index c993fad..da44178 100755
--- a/i18n/xx/null_all.sh
+++ b/i18n/xx/null_all.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-echo "this script adds nullstrings everywhere"
+echo "this script adds 'FOO' everywhere"
 perl -pi -e "s/<translation.*/<translation>FOO<\/translation>/" *.ts
+echo "all strings replaced with 'FOO'"
diff --git a/i18n/xx/odict.ts b/i18n/xx/odict.ts
index 3af8451..1a624e8 100644
--- a/i18n/xx/odict.ts
+++ b/i18n/xx/odict.ts
@@ -1,131 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Help</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/oipkg.ts b/i18n/xx/oipkg.ts
deleted file mode 100644
index be86714..0000000
--- a/i18n/xx/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/opie-console.ts b/i18n/xx/opie-console.ts
index bc67370..b93ab4a 100644
--- a/i18n/xx/opie-console.ts
+++ b/i18n/xx/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Init string </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Value</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Value :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Look</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Gray</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Micro</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Medium</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Parity</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Odd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Even</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>6</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1.5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save history</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Script</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>History</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Receive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ready</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No error.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Serial</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>medium</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>black on white</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>white on black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>green on black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opie-login.ts b/i18n/xx/opie-login.ts
index 333c5bf..e88e202 100644
--- a/i18n/xx/opie-login.ts
+++ b/i18n/xx/opie-login.ts
@@ -1,83 +1,94 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/opieirc.ts b/i18n/xx/opieirc.ts
index dfa2369..fb81a24 100644
--- a/i18n/xx/opieirc.ts
+++ b/i18n/xx/opieirc.ts
@@ -1,510 +1,554 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Query</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Whois</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> joined channel </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You left channel </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> left channel </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown channel </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You are now known as </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> is now known as </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> has quit </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Port required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>IRC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opieplayer.ts b/i18n/xx/opieplayer.ts
index cd39d53..5f5a3dc 100644
--- a/i18n/xx/opieplayer.ts
+++ b/i18n/xx/opieplayer.ts
@@ -1,268 +1,268 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> File: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Skins</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Path</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/opieplayer2.ts b/i18n/xx/opieplayer2.ts
deleted file mode 100644
index f988dd8..0000000
--- a/i18n/xx/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/opierec.ts b/i18n/xx/opierec.ts
new file mode 100644
index 0000000..ee27845
--- a/dev/null
+++ b/i18n/xx/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/osearch.ts b/i18n/xx/osearch.ts
new file mode 100644
index 0000000..8c11bb7
--- a/dev/null
+++ b/i18n/xx/osearch.ts
@@ -0,0 +1,143 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>adressbook</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>todo</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>datebook</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>applications</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/patience.ts b/i18n/xx/patience.ts
index a09fdf4..2aef065 100644
--- a/i18n/xx/patience.ts
+++ b/i18n/xx/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpdf.ts b/i18n/xx/qpdf.ts
index 4cbcce4..725ade0 100644
--- a/i18n/xx/qpdf.ts
+++ b/i18n/xx/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File does not exist !</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index c19d078..3952e55 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,252 +1,252 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/reader.ts b/i18n/xx/reader.ts
index be20abd..83f70e6 100644
--- a/i18n/xx/reader.ts
+++ b/i18n/xx/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
+        <source>Toolbar Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Close</source>
+        <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Info</source>
+        <source>Navigation</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>On Action...</source>
+        <source>Marks</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Open File</source>
+        <source>Indicators</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&lt;Nothing&gt;</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Open file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Autoscroll</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Mark</source>
+        <source>Bookmark</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Scroll</source>
+        <source>Zoom out</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Jump</source>
+        <source>Back</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Use Cursor</source>
+        <source>Page up</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
+        <source>Page down</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Target</source>
+        <source>Line down</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Up</source>
+        <source>Space Button</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Down</source>
+        <source>Return Button</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Find...</source>
+        <source>Left Arrow</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Continuous</source>
+        <source>Right Arrow</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Up Arrow</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
+        <source>Info</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Embolden</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Full Justify</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Text</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Remap</source>
+        <source>Indent</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Embolden</source>
+        <source>Page
+Overlap</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Graphics
+Zoom</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Margin</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Paragraph
+Leading</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Line
+Leading</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Buttons</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CURLDialog</name>
+    <message>
+        <source>Save URL</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Local file</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Global file</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom Out</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Set Font</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Encoding</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Encoding</source>
+        <source>Ideogram</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
     <message>
-        <source>Ascii</source>
+        <source>Open</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Close</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Info</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Scroll</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Jump</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Page/Line Scroll</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Goto</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/rotation.ts b/i18n/xx/rotation.ts
deleted file mode 100644
index 7dce1bf..0000000
--- a/i18n/xx/rotation.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotationSettings</name>
-    <message>
-        <source>Rotation Settings</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Select orientation from options at left.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Automatically restart Opie?</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Rotation is not enabled in this demo, however this is a supported feature of Qt/Embedded.</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 4aa13d9..ecddb87 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -1,105 +1,117 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/sfcave-sdl.ts b/i18n/xx/sfcave-sdl.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/xx/sfcave-sdl.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/xx/sheetqt.ts b/i18n/xx/sheetqt.ts
index 821efab..e5e4f1f 100644
--- a/i18n/xx/sheetqt.ts
+++ b/i18n/xx/sheetqt.ts
@@ -1,787 +1,791 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Row</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Summation</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Absolute Value</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arc Sine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cosine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ArcCosine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tangent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Power</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Average</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Count</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Functions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Sheets</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/snake.ts b/i18n/xx/snake.ts
index 1216698..0a0f3fd 100644
--- a/i18n/xx/snake.ts
+++ b/i18n/xx/snake.ts
@@ -1,40 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/stockticker.ts b/i18n/xx/stockticker.ts
new file mode 100644
index 0000000..c4e96b1
--- a/dev/null
+++ b/i18n/xx/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index 5c99624..20b9deb 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -1,302 +1,286 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
-</context>
-<context>
-    <name>StorageInfo</name>
     <message>
-        <source>CF Card: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Hard Disk </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <source>You really want to send %1 to this process?</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/systemtime.ts b/i18n/xx/systemtime.ts
index 5f0f3bd..1ea0ae4 100644
--- a/i18n/xx/systemtime.ts
+++ b/i18n/xx/systemtime.ts
@@ -1,250 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12/24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>24 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>12 hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Weeks start on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source> seconds</source>
+        <source>Could not connect to server </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 seconds</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Last [h]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Offset [s]</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Predict time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time server information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set predicted time</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/tetrix.ts b/i18n/xx/tetrix.ts
index 895ebc0..f790117 100644
--- a/i18n/xx/tetrix.ts
+++ b/i18n/xx/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Score</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Level</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Removed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/textedit.ts b/i18n/xx/textedit.ts
index 439f528..d728ebf 100644
--- a/i18n/xx/textedit.ts
+++ b/i18n/xx/textedit.ts
@@ -1,264 +1,273 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.desktop File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Goto Line...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Write Failed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unnamed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Textedit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>read</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>write</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/tictac.ts b/i18n/xx/tictac.ts
index f2f3f63..d21f9a7 100644
--- a/i18n/xx/tictac.ts
+++ b/i18n/xx/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/tinykate.ts b/i18n/xx/tinykate.ts
new file mode 100644
index 0000000..973fa3b
--- a/dev/null
+++ b/i18n/xx/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index e4f6917..5bb0955 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -1,117 +1,188 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Tiny Banner</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index 8ce004e..0daa264 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -1,555 +1,593 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OTaskEditor</name>
+    <name>MainWindow</name>
     <message>
-        <source>Alarms</source>
+        <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Reminders</source>
+        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
     <message>
-        <source>X-Ref</source>
+        <source>Alarms</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Information</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Task Editor</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>silent</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>View Task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete all...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete completed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QuickEdit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Template Editor</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>New Template %1</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Date</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Complete </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Work on </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buy </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Organize </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Get </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Update </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Create </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Plan </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Call </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mail </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Summary:</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Started</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Postponed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Finished</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not started</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>0 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>20 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>40 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>60 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>80 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>100 %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Due Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Completed:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Nothing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Responsible</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Done By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Coordinating</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Maintainer:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>test</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>FOO</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation>FOO</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Click here to set the priority of new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Enter description of new task here.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Click here to enter additional information for new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Click here to add new task.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Click here to reset new task information.
-
-This area is called the quick task bar.
-
-It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation>FOO</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/xx/ubrowser.ts b/i18n/xx/ubrowser.ts
new file mode 100644
index 0000000..271a3f0
--- a/dev/null
+++ b/i18n/xx/ubrowser.ts
@@ -0,0 +1,48 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>couldnt find ip address</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>couldnt create socket</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>couldnt connect to socket</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation>FOO</translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/usermanager.ts b/i18n/xx/usermanager.ts
index 553c5de..48bc9eb 100644
--- a/i18n/xx/usermanager.ts
+++ b/i18n/xx/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/wellenreiter.ts b/i18n/xx/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/xx/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/zh_CN/.cvsignore b/i18n/zh_CN/.cvsignore
deleted file mode 100644
index 8df47d5..0000000
--- a/i18n/zh_CN/.cvsignore
+++ b/dev/null
@@ -1 +0,0 @@
-*.qm
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
deleted file mode 100644
index cec5d52..0000000
--- a/i18n/zh_CN/addressbook.ts
+++ b/dev/null
@@ -1,1504 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AbTable</name>
-    <message>
-        <source>Full Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pick</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AddressbookWindow</name>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have to select a contact !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have to set a filename !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The selected file 
- does not end with &quot;.vcf&quot;.
- Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want add contact for 
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts - My Personal Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDlg_Base</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on tab to select one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Query Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings for the search query style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search widget expects regular expressions if selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search widget just expects simple wildcards</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If selected, search differs between upper and lower chars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font size for list- and card view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moveable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fontsettings for list and card view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Sharp&apos;s mail application if available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use OPIE mail if installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notice: QT-Mail is just 
-provided in the SHARP 
-default ROM. Opie-Mail 
-is provided free !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selected attribute one line up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selected attribute one line down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List of all available attributes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add selected attribute from list below to the upper list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove the selected attribute from the upper list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactEditor</name>
-    <message>
-        <source>Full Name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to enter last- middle and firstname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The jobtitle..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Something like &quot;jr.&quot;..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Organization</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The working place of the contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to select attribute to change</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to select how to store the name (and howto show it in the listview)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zip Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United States</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>United Kingdom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Afghanistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Albania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Algeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>American Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Andorra</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Angola</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anguilla</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antarctica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argentina</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Armenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aruba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Australia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Austria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahamas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bahrain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barbados</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belarus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Belize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Benin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bermuda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bhutan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bolivia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Botswana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brazil</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Burundi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cambodia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cameroon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Canada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>China</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colombia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comoros</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cook Island</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Croatia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cuba</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyprus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Denmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Djibouti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>East Timor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ecuador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Egypt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>El Salvador</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eritrea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fiji</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>France</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Guiana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gabon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Georgia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germany</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ghana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greece</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Greenland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Grenada</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guadeloupe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guatemala</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guinea-Bissau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Guyana</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Haiti</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holy See</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Honduras</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hungary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iceland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>India</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indonesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ireland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Israel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jamaica</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Japan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jordan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kenya</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kiribati</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Korea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kuwait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kyrgyzstan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Laos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Latvia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lebanon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lesotho</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liberia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithuania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Macedonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Madagascar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malawi</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malaysia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maldives</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mali</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Martinique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mauritius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mayotte</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mexico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micronesia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moldova</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monaco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mongolia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Montserrat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Morocco</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mozambique</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Myanmar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Namibia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nauru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nepal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Netherlands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Zealand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nigeria</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Norway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Oman</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pakistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palestinian Sovereign Areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Panama</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paraguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peru</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Philippines</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pitcairn Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Poland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Portugal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reunion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Romania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Russia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rwanda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samoa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>San Marino</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Senegal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seychelles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Singapore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovakia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Slovenia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Somalia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>South Africa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spain</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>St. Helena</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sudan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suriname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Swaziland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sweden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switzerland</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taiwan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tanzania</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thailand</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Togo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tokelau</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tonga</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tunisia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkey</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uganda</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ukraine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uruguay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Venezuela</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vietnam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yemen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zambia</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/advancedfm.ts b/i18n/zh_CN/advancedfm.ts
deleted file mode 100644
index 200ed6f..0000000
--- a/i18n/zh_CN/advancedfm.ts
+++ b/dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AdvancedFm</name>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Symlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Same Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add To Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Command with Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Current Directory from Bookmarks</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>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Directory?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Exists!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Output</name>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save output to file (name only)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/appearance.ts b/i18n/zh_CN/appearance.ts
deleted file mode 100644
index 38c15aa..0000000
--- a/i18n/zh_CN/appearance.ts
+++ b/dev/null
@@ -1,270 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Appearance</name>
-    <message>
-        <source>Styles control the way items such as buttons and scroll bars appear in all applications.
-
-Click here to select an available style.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure the currently selected style.
-
-Note:  This option is not available for all styles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Window decorations control the way the application title bar and its buttons appear.
-
-Click here to select an available decoration.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired name, style and size of the default font applications will use.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color schemes are a collection of colors which are used for various parts of the display.
-
-Click here to select an available scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change the colors in the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the color scheme selected in the list to the left.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to name and save the current color scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force styling for all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
-
-1. Tabs - normal tabs with text labels only
-2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
-3. Drop down list - a vertical listing of tabs
-4. Drop down list w/icons - a vertical listing of tabs with icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Drop down list w/icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the top of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here so that tabs appear at the bottom of the window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Appearance Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheme does already exist.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete current scheme.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;new&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditScheme</name>
-    <message>
-        <source>Edit scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a color for: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleWindow</name>
-    <message>
-        <source>Sample</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disabled Item</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Highlighted Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Box</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample window using the selected settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/aqpkg.ts b/i18n/zh_CN/aqpkg.ts
deleted file mode 100644
index 348cc10..0000000
--- a/i18n/zh_CN/aqpkg.ts
+++ b/dev/null
@@ -1,546 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CategoryFilterImpl</name>
-    <message>
-        <source>Category Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DataManager</name>
-    <message>
-        <source>Reading configuration...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputDialog</name>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space Avail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-**** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InstallOptionsDlgImpl</name>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Force Overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Errors only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Informative messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>AQPkg - Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type the text to search for here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the Quick Jump toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to update package lists from servers.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to upgrade all installed packages if a newer version is available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply changes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install, remove or upgrade currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show packages not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages available which have not been installed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show updated packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to show packages currently installed on this device which have a newer version available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to list packages belonging to one category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set filter category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to change package category to used filter.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to search for text in package names.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to find the next package name containing the text you are searching for.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Jump keypad</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this application.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to hide the find toolbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select a package feed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all packages for the server feed selected above.
-
-A blue dot next to the package name indicates that the package is currently installed.
-
-A blue dot with a star indicates that a newer version of the package is available from the server feed.
-
-Click inside the box at the left to select a package.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to uninstall the currently selected package(s).</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building server list:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Building package list for:
-<byte value="x9"/>%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refreshing server package lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WARNING: Upgrading while
-Opie/Qtopia is running
-is NOT recommended!
-
-Are you sure?
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warning</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upgrading installed packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you wish to delete
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download to where</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter path to download to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Remote Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter package location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nothing to do</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No packages selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or reinstall
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ReInstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you wish to remove or upgrade
-%1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove or Upgrade</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>U</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageWindow</name>
-    <message>
-        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsImpl</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FTP Proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/backgammon.ts b/i18n/zh_CN/backgammon.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/backgammon.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/backup.ts b/i18n/zh_CN/backup.ts
deleted file mode 100644
index 02b6cc2..0000000
--- a/i18n/zh_CN/backup.ts
+++ b/dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BackupAndRestore</name>
-    <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup and Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BackupAndRestoreBase</name>
-    <message>
-        <source>Backup And Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Applications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Backup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select Source</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/bounce.ts b/i18n/zh_CN/bounce.ts
deleted file mode 100644
index 9d2d3d1..0000000
--- a/i18n/zh_CN/bounce.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KJezzball</name>
-    <message>
-        <source>Bounce</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 00%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game paused.
-Press P to continue!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over!
-Score: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lives: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: %1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filled: 0%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully cleared more than 75%.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: 15 points per life
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Bonus
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 points: Total score
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On to level %1.
-You get %2 lives this time!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/buttonsettings.ts b/i18n/zh_CN/buttonsettings.ts
deleted file mode 100644
index 6c13a5b..0000000
--- a/i18n/zh_CN/buttonsettings.ts
+++ b/dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ButtonSettings</name>
-    <message>
-        <source>Button Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hold:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam VCard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send eMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle O-Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Desktop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Recording</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RemapDlg</name>
-    <message>
-        <source>%1 %2</source>
-        <comment>(hold|press) buttoname</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Held</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pressed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No mapping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RemapDlgBase</name>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/buzzword.ts b/i18n/zh_CN/buzzword.ts
deleted file mode 100644
index 076f679..0000000
--- a/i18n/zh_CN/buzzword.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BuzzWord</name>
-    <message>
-        <source>buZzword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/calculator.ts b/i18n/zh_CN/calculator.ts
deleted file mode 100644
index 2f945c2..0000000
--- a/i18n/zh_CN/calculator.ts
+++ b/dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calculator</name>
-    <message>
-        <source>Experimental Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>log</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ln</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>cos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>tan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+/-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>=</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>x</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CalculatorImpl</name>
-    <message>
-        <source>Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/checkbook.ts b/i18n/zh_CN/checkbook.ts
deleted file mode 100644
index 2851c82..0000000
--- a/i18n/zh_CN/checkbook.ts
+++ b/dev/null
@@ -1,505 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Checkbook</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transactions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password protect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to enable/disable password protection of this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select type of checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bank:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter name of the bank for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter account number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PIN number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter PIN number for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Starting balance:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the initial balance for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this checkbook here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all transactions entered for this checkbook.
-
-To sort entries by a specific field, click on the column name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Num</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new transaction.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a transaction and then click here to edit it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to delete it.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the desired chart below and then click on the Draw button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the desired chart type.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawals by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposits by category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to draw the selected chart.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current balance: %1%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Confirm password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please confirm your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password to confirm removal of password protection:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete transaction</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Configuration</name>
-    <message>
-        <source>Configure Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter currency symbol:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your local currency symbol here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show whether checkbook is password
-protected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show checkbook balances</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new checkbook.
-
-You also can select New from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here to edit it.
-
-You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a checkbook and then click here delete it.
-
-You also can select Delete from the Checkbook menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to configure this app.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a listing of all checkbooks currently available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checkbook Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Balance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter your password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete checkbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Transaction</name>
-    <message>
-        <source>Transaction for </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Withdrawal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deposit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select date of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter check number here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter description of transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction category here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select transaction type here.
-
-The options available vary based on whether the transaction is a deposit or withdrawal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fee:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter any additional information for this transaction here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debit Charge</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written Check</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Credit Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Work</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic Payment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cash</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/citytime.ts b/i18n/zh_CN/citytime.ts
deleted file mode 100644
index ef631e9..0000000
--- a/i18n/zh_CN/citytime.ts
+++ b/dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CityTime</name>
-    <message>
-        <source>Time Changing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting timezone %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restore Time Zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CityTimeBase</name>
-    <message>
-        <source>City Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ZoneMap</name>
-    <message>
-        <source>CITY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to Find Timezone Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Couldn&apos;t Find Map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/clock.ts b/i18n/zh_CN/clock.ts
deleted file mode 100644
index bd9e904..0000000
--- a/i18n/zh_CN/clock.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Clock</name>
-    <message>
-        <source>Snooze</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/confedit.ts b/i18n/zh_CN/confedit.ts
deleted file mode 100644
index a4f440a..0000000
--- a/i18n/zh_CN/confedit.ts
+++ b/dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>EditWidget</name>
-    <message>
-        <source>File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewConfDir</name>
-    <message>
-        <source>Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The directory </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ListViewItemConfFile</name>
-    <message>
-        <source>Could not open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> could not be opened.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>no group</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Conf File Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Revert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
deleted file mode 100644
index 7cc5f42..0000000
--- a/i18n/zh_CN/datebook.ts
+++ b/dev/null
@@ -1,804 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBook</name>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Today</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>WeekLst</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Event duration is potentially longer
-than interval between repeats.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar was unable to save
-your changes.
-Free up some space and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>(Unknown)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fix it</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayHeaderBase</name>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayView</name>
-    <message>
-        <source>:00p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookDayWidget</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</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>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettings</name>
-    <message>
-        <source>:00 PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00 AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookSettingsBase</name>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start viewing events</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alarm Preset</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Views</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default view:</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>Week List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time display</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start-End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeek</name>
-    <message>
-        <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeader</name>
-    <message>
-        <source>w</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstHeaderBase</name>
-    <message>
-        <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekView</name>
-    <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntry</name>
-    <message>
-        <source>Start Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calendar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Daily...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weekly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monthly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yearly...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateEntryBase</name>
-    <message>
-        <source>New Event</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meeting</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dinner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start - End </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alarm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No Repeat...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoteEntryBase</name>
-    <message>
-        <source>Edit Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntry</name>
-    <message>
-        <source>No Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RepeatEntryBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/drawpad.ts b/i18n/zh_CN/drawpad.ts
deleted file mode 100644
index 229dfbc..0000000
--- a/i18n/zh_CN/drawpad.ts
+++ b/dev/null
@@ -1,435 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the last page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select one of the available tools to draw lines.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the width of the drawing pen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the color used when drawing.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the color used when filling in areas.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the current sheet up one position in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to move the current sheet down one position in the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/embeddedkonsole.ts b/i18n/zh_CN/embeddedkonsole.ts
deleted file mode 100644
index 48a196e..0000000
--- a/i18n/zh_CN/embeddedkonsole.ts
+++ b/dev/null
@@ -1,217 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CommandEditDialog</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CommandEditDialogBase</name>
-    <message>
-        <source>Commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Konsole</name>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide command list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Bottom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Transparent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Green on Yellow</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Magenta</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magenta on Blue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cyan on White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White on Cyan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blue on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amber on Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quick Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ScrollBar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Beep</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Command List</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Command Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>editCommandBase</name>
-    <message>
-        <source>Add command</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter command to add:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/euroconv.ts b/i18n/zh_CN/euroconv.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/euroconv.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/fifteen.ts b/i18n/zh_CN/fifteen.ts
deleted file mode 100644
index b52d689..0000000
--- a/i18n/zh_CN/fifteen.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FifteenMainWindow</name>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PiecesTable</name>
-    <message>
-        <source>Fifteen Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulations!
-You win the game!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;andomize Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Reset Pieces</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/filebrowser.ts b/i18n/zh_CN/filebrowser.ts
deleted file mode 100644
index a7e2016..0000000
--- a/i18n/zh_CN/filebrowser.ts
+++ b/dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FileBrowser</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Name </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Size </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Date </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>by Type </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Symlinks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parent dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileView</name>
-    <message>
-        <source>File Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Can&apos;t show /dev/ directory.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New folder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Folder creation failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Launch failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add to Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View as text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deselect all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>filePermissions</name>
-    <message>
-        <source>Set File Permissions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set file permissions for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Owner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>write</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/formatter.ts b/i18n/zh_CN/formatter.ts
deleted file mode 100644
index 751e732..0000000
--- a/i18n/zh_CN/formatter.ts
+++ b/dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatterApp</name>
-    <message>
-        <source>Formatter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File Systems</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit fstab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mount Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format?!?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Really format
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-with </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not format.
-Unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Formatter Output</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to umount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>umount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not umount.
-Device is busy!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such device!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully formatted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trying to mount.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Card mount failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You can now close the output window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Storage Type : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Total: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used: %1 kB ( %d mB)
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Available: %1 kB ( %d mB)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/go.ts b/i18n/zh_CN/go.ts
deleted file mode 100644
index 07e1e03..0000000
--- a/i18n/zh_CN/go.ts
+++ b/dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>GoMainWidget</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resign</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two player option</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>GoWidget</name>
-    <message>
-        <source>White %1, Black %2. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black wins.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A draw.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>I pass</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Prisoners: black %1, white %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/helpbrowser.ts b/i18n/zh_CN/helpbrowser.ts
deleted file mode 100644
index 4951556..0000000
--- a/i18n/zh_CN/helpbrowser.ts
+++ b/dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <source>Backward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HelpBrowser</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/kbill.ts b/i18n/zh_CN/kbill.ts
deleted file mode 100644
index f4d45dd..0000000
--- a/i18n/zh_CN/kbill.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KBill</name>
-    <message>
-        <source>kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Story of kBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pause Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The story of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The rules of KBill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>UI</name>
-    <message>
-        <source>After Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your score</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/kcheckers.ts b/i18n/zh_CN/kcheckers.ts
deleted file mode 100644
index ebf2980..0000000
--- a/i18n/zh_CN/kcheckers.ts
+++ b/dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KCheckers</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Undo Move</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Novice</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Master</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show Numeration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;English Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Russian Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Green Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Marble Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Wooden Board</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s This</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rules of Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;About KCheckers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About &amp;Qt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Skill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> New Game </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Undo Move </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Rules of Play </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please wait...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect course.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/keypebble.ts b/i18n/zh_CN/keypebble.ts
deleted file mode 100644
index d988a88..0000000
--- a/i18n/zh_CN/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/kpacman.ts b/i18n/zh_CN/kpacman.ts
deleted file mode 100644
index fb73268..0000000
--- a/i18n/zh_CN/kpacman.ts
+++ b/dev/null
@@ -1,232 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keys</name>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Direction Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Kpacman</name>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hall of fame</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide Mousecursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Select graphic scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Pause in Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Continue in Foreground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change &amp;keys...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@PACKAGE@ - @VERSION@
-
-Joerg Thoennissen (joe@dsite.de)
-
-A pacman game for the KDE Desktop
-
-The program based on the source of ksnake
-by Michel Filippi (mfilippi@sade.rhein-main.de).
-The design was strongly influenced by the pacman
-(c) 1980 MIDWAY MFG.CO.
-
-I like to thank my girlfriend Elke Krueers for
-the last 10 years of her friendship.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configuration Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KpacmanWidget</name>
-    <message>
-        <source>The bitfont could not be contructed.
-
-The file &apos;@FONTNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Referee</name>
-    <message>
-        <source>GAME  OVER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PLAYER ONE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>READY!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CHARACTER</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NICKNAME</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SHADOW</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;BLINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-SPEEDY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;PINKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-BASHFUL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;INKY&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-POKEY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;CLYDE&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PRESS CURSOR TO START</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Score</name>
-    <message>
-        <source>  1UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  2UP </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     CONGRATULATIONS      </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>    YOU HAVE ARCHIEVED    </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  A SCORE IN THE TOP 10.  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PAUSED</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Status</name>
-    <message>
-        <source>The pixmap could not be contructed.
-
-The file &apos;@PIXMAPNAME@&apos; does not exist,
-or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initialization Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/language.ts b/i18n/zh_CN/language.ts
deleted file mode 100644
index 34e0346..0000000
--- a/i18n/zh_CN/language.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LanguageSettings</name>
-    <message>
-        <source>English</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>default</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageSettingsBase</name>
-    <message>
-        <source>Language Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select language</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/launchersettings.ts b/i18n/zh_CN/launchersettings.ts
deleted file mode 100644
index d6ee0ff..0000000
--- a/i18n/zh_CN/launchersettings.ts
+++ b/dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LauncherSettings</name>
-    <message>
-        <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>O-Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MenuSettings</name>
-    <message>
-        <source>Load applets in O-Menu:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Launcher tabs in O-Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the applets that you want to have included in the O-Menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleView</name>
-    <message>
-        <source>Sample 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabDialog</name>
-    <message>
-        <source>Edit Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previewing %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a rough preview of what the currently selected Tab will look like.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use a custom font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabsSettings</name>
-    <message>
-        <source>Launcher Tabs:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>foobar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable big busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the Launcher Tab you want to edit or delete.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adds a new Tab to the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opens a new dialog to customize the select Tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deletes a Tab from the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not implemented yet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskbarSettings</name>
-    <message>
-        <source>Load applets in Taskbar:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the applets that you want displayed in the Taskbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libbatteryapplet.ts b/i18n/zh_CN/libbatteryapplet.ts
deleted file mode 100644
index c9fe974..0000000
--- a/i18n/zh_CN/libbatteryapplet.ts
+++ b/dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>BatteryStatus</name>
-    <message>
-        <source>Battery status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>could not open file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Charging</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Good</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Very Low</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Critical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On backup power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power on-line</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>External power disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libcardmonapplet.ts b/i18n/zh_CN/libcardmonapplet.ts
deleted file mode 100644
index 3637f01..0000000
--- a/i18n/zh_CN/libcardmonapplet.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CardMonitor</name>
-    <message>
-        <source>Eject SD/MMC card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 0: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Eject card 1: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CF/PCMCIA card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD/MMC card eject failed!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New card: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ejected: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libclipboardapplet.ts b/i18n/zh_CN/libclipboardapplet.ts
deleted file mode 100644
index 9b0ac97..0000000
--- a/i18n/zh_CN/libclipboardapplet.ts
+++ b/dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ClipboardApplet</name>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libclockapplet.ts b/i18n/zh_CN/libclockapplet.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/libclockapplet.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/libflat.ts b/i18n/zh_CN/libflat.ts
deleted file mode 100644
index 8406d92..0000000
--- a/i18n/zh_CN/libflat.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Decoration</name>
-    <message>
-        <source>Flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libflatstyle.ts b/i18n/zh_CN/libflatstyle.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/libflatstyle.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/libfreetypefactory.ts b/i18n/zh_CN/libfreetypefactory.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/libfreetypefactory.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/libhomeapplet.ts b/i18n/zh_CN/libhomeapplet.ts
deleted file mode 100644
index 818c609..0000000
--- a/i18n/zh_CN/libhomeapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HomeApplet</name>
-    <message>
-        <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Desktop</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libinterfaces.ts b/i18n/zh_CN/libinterfaces.ts
deleted file mode 100644
index 407ea1f..0000000
--- a/i18n/zh_CN/libinterfaces.ts
+++ b/dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InterfaceAdvanced</name>
-    <message>
-        <source>Advanced Interface Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>eth0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lease Expires</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lease Obtained</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MAC Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InterfaceInformation</name>
-    <message>
-        <source>Interface Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MAC Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Broadcast</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;View Advanced Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InterfaceSetup</name>
-    <message>
-        <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DHCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gateway</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Second DNS</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InterfaceSetupImp</name>
-    <message>
-        <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libirdaapplet.ts b/i18n/zh_CN/libirdaapplet.ts
deleted file mode 100644
index 291e2b3..0000000
--- a/i18n/zh_CN/libirdaapplet.ts
+++ b/dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IrdaApplet</name>
-    <message>
-        <source>Found:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lost:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libkeyview.ts b/i18n/zh_CN/libkeyview.ts
deleted file mode 100644
index 4f2b2a8..0000000
--- a/i18n/zh_CN/libkeyview.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Keyview</name>
-    <message>
-        <source>Keyview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
deleted file mode 100644
index a60e040..0000000
--- a/i18n/zh_CN/libliquid.ts
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Decoration</name>
-</context>
-<context>
-    <name>LiquidSettings</name>
-    <message>
-        <source>Liquid Style</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Translucent stippled, button color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Custom translucency</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Menu color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opacity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use shadowed menu text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stipple contrast</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/liblogoutapplet.ts b/i18n/zh_CN/liblogoutapplet.ts
deleted file mode 100644
index 06cbe25..0000000
--- a/i18n/zh_CN/liblogoutapplet.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LogoutApplet</name>
-    <message>
-        <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to
-end this session ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libmetal.ts b/i18n/zh_CN/libmetal.ts
deleted file mode 100644
index b82c564..0000000
--- a/i18n/zh_CN/libmetal.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Styles</name>
-    <message>
-        <source>Metal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libnotesapplet.ts b/i18n/zh_CN/libnotesapplet.ts
deleted file mode 100644
index 6bbcf69..0000000
--- a/i18n/zh_CN/libnotesapplet.ts
+++ b/dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>NotesControl</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to&lt;BR&gt;&lt;B&gt; delete&lt;/B&gt; this note ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search For...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle Maximized</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libopie.ts b/i18n/zh_CN/libopie.ts
deleted file mode 100644
index b78f90c..0000000
--- a/i18n/zh_CN/libopie.ts
+++ b/dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ORecurranceBase</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"></translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>WeekVar</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>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libopieobex.ts b/i18n/zh_CN/libopieobex.ts
deleted file mode 100644
index 5fda095..0000000
--- a/i18n/zh_CN/libopieobex.ts
+++ b/dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OtherHandler</name>
-    <message>
-        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SendWidget</name>
-    <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IrDa is not enabled!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching for IrDa Devices.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bluetooth is not available</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching for bluetooth Devices.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scheduling for beam.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Try %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search again for IrDa.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start sending</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libpolished.ts b/i18n/zh_CN/libpolished.ts
deleted file mode 100644
index 611bcc2..0000000
--- a/i18n/zh_CN/libpolished.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Decoration</name>
-    <message>
-        <source>Polished</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqdvorak.ts b/i18n/zh_CN/libqdvorak.ts
deleted file mode 100644
index 5e1ab53..0000000
--- a/i18n/zh_CN/libqdvorak.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Dvorak</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqhandwriting.ts b/i18n/zh_CN/libqhandwriting.ts
deleted file mode 100644
index 26e4b52..0000000
--- a/i18n/zh_CN/libqhandwriting.ts
+++ b/dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>HandwritingHelp</name>
-    <message>
-        <source>Handwriting Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tips</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Trainer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HandwritingTrainer</name>
-    <message>
-        <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No match</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Matched: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Similar to: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1%</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Handwriting</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenEdit</name>
-    <message>
-        <source>New...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInput</name>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenInputCharDlg</name>
-    <message>
-        <source>Enter new character</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenPrefBase</name>
-    <message>
-        <source>Multi-stroke character timeout:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Input areas displayed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upper and lower case areas</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lower case (toggle Upper case)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QIMPenSetup</name>
-    <message>
-        <source>Setup Handwriting Input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Character Profile:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Customize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 ms</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to save information.
-Free up some space
-and try again.
-
-Quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqjumpx.ts b/i18n/zh_CN/libqjumpx.ts
deleted file mode 100644
index 80ea414..0000000
--- a/i18n/zh_CN/libqjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>JumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqkeyboard.ts b/i18n/zh_CN/libqkeyboard.ts
deleted file mode 100644
index 318758e..0000000
--- a/i18n/zh_CN/libqkeyboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqkjumpx.ts b/i18n/zh_CN/libqkjumpx.ts
deleted file mode 100644
index 964d5dc..0000000
--- a/i18n/zh_CN/libqkjumpx.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>KJumpX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqmultikey.ts b/i18n/zh_CN/libqmultikey.ts
deleted file mode 100644
index d1d7b71..0000000
--- a/i18n/zh_CN/libqmultikey.ts
+++ b/dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Multikey Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Keymap File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Repeat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Key Pressed Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Multikey</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqpe.ts b/i18n/zh_CN/libqpe.ts
deleted file mode 100644
index b75236e..0000000
--- a/i18n/zh_CN/libqpe.ts
+++ b/dev/null
@@ -1,886 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Categories</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> (multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Personal</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryCombo</name>
-    <message>
-        <source> (Multi.)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEdit</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Category </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryEditBase</name>
-    <message>
-        <source>Category Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Categories Go Here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryMenu</name>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategorySelect</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry, another application is
-editing categories.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Categories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookMonthHeader</name>
-    <message>
-        <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show the next month</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelector</name>
-    <message>
-        <source>Close the File Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileSelectorView</name>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidget</name>
-    <message>
-        <source>String Not Found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindWidgetBase</name>
-    <message>
-        <source>Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find what:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Search at:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search Backwards</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkProperties</name>
-    <message>
-        <source>Properties</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File deletion failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Duplicate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File copy failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Moving Document failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LnkPropertiesBase</name>
-    <message>
-        <source>Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fast load (consumes memory)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comment:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OwnerDlg</name>
-    <message>
-        <source>Owner Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordBase</name>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>New Document</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-Configuration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to create start up files
-Please free up some space
-before entering data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Free some memory and try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>day</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>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email Addresses: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEApplication</name>
-    <message>
-        <source>%1 document</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
-    <message>
-        <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QPEManager</name>
-    <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SD Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MMC Card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Internal Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TZCombo</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeZoneSelector</name>
-    <message>
-        <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to choose the time zones,
-please install citytime.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimerReceiverObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to schedule alarm.
-Please free up space and try again</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TypeCombo</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 %2</source>
-        <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All %1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libqpickboard.ts b/i18n/zh_CN/libqpickboard.ts
deleted file mode 100644
index 488fb8f..0000000
--- a/i18n/zh_CN/libqpickboard.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InputMethods</name>
-    <message>
-        <source>Pickboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/librestartapplet.ts b/i18n/zh_CN/librestartapplet.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/librestartapplet.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/librotateapplet.ts b/i18n/zh_CN/librotateapplet.ts
deleted file mode 100644
index e9a8374..0000000
--- a/i18n/zh_CN/librotateapplet.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>RotateApplet</name>
-    <message>
-        <source>Rotate shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libscreenshotapplet.ts b/i18n/zh_CN/libscreenshotapplet.ts
deleted file mode 100644
index ebc9a78..0000000
--- a/i18n/zh_CN/libscreenshotapplet.ts
+++ b/dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ScreenshotControl</name>
-    <message>
-        <source>Delay</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save named</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save screenshot as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of screenshot </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Success</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Screenshot was uploaded to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection to %1 failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtinykate.ts b/i18n/zh_CN/libtinykate.ts
deleted file mode 100644
index 332e367..0000000
--- a/i18n/zh_CN/libtinykate.ts
+++ b/dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Out of Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem creating
-KateConfiguration Information 
-for this program.
-
-Please free up some space and
-try again.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodayaddressbookplugin.ts b/i18n/zh_CN/libtodayaddressbookplugin.ts
deleted file mode 100644
index 2f40ece..0000000
--- a/i18n/zh_CN/libtodayaddressbookplugin.ts
+++ b/dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddressBookPluginConfig</name>
-    <message>
-        <source>Max Lines: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Days look ahead: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many days we should search forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Headline Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors for the headlines !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Entry Color: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This color will be used for shown birthdays/anniversaries !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Urgent
-Color if below </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> days: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This urgent color will be used if we are close to the event !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>AddressBook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodaydatebookplugin.ts b/i18n/zh_CN/libtodaydatebookplugin.ts
deleted file mode 100644
index e392d58..0000000
--- a/i18n/zh_CN/libtodaydatebookplugin.ts
+++ b/dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DateBookEvent</name>
-    <message>
-        <source>[with alarm]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>note</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Datebook plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No more appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No appointments today</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodayfortuneplugin.ts b/i18n/zh_CN/libtodayfortuneplugin.ts
deleted file mode 100644
index 931718a..0000000
--- a/i18n/zh_CN/libtodayfortuneplugin.ts
+++ b/dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Fortune plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodaymailplugin.ts b/i18n/zh_CN/libtodaymailplugin.ts
deleted file mode 100644
index a7b6519..0000000
--- a/i18n/zh_CN/libtodaymailplugin.ts
+++ b/dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Mail plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodaystocktickerplugin.ts b/i18n/zh_CN/libtodaystocktickerplugin.ts
deleted file mode 100644
index 0693d23..0000000
--- a/i18n/zh_CN/libtodaystocktickerplugin.ts
+++ b/dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>StockTicker plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StockTickerPluginWidget</name>
-    <message>
-        <source>Connection refused.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find server.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Socket read error.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>StocktickerPluginConfig</name>
-    <message>
-        <source>Enter stock symbols seperated
-by a space.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Time of current price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles date field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Symbol field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles Name of symbols owner field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles current Price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles last price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles opening price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles minimum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles maximum daily price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles daily variation of price field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggles volume of trading field</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>How often stocks prices should be looked up. In minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minutes between lookups.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Speed of scrolling action, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Speed, in milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Length of scrolling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll Length</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodaytodolistplugin.ts b/i18n/zh_CN/libtodaytodolistplugin.ts
deleted file mode 100644
index 5ca01fe..0000000
--- a/i18n/zh_CN/libtodaytodolistplugin.ts
+++ b/dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Todolist plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No active tasks</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/libtodayweatherplugin.ts b/i18n/zh_CN/libtodayweatherplugin.ts
deleted file mode 100644
index 8f245b0..0000000
--- a/i18n/zh_CN/libtodayweatherplugin.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Weather plugin</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginConfig</name>
-    <message>
-        <source>Enter ICAO location identifier:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Visit http://www.nws.noaa.gov/tg/siteloc.shtml to find the nearest location.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use metric units</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select type of units displayed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update frequency (in minutes):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select how often (in minutes) you want the weather to be updated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WeatherPluginWidget</name>
-    <message>
-        <source>Retreiving current weather information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Temp: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>  Wind: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Pres: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current weather data not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>E </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>N </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>NW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SW </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>S </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SE </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> KPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> MPH</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> hPa</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> Hg</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/light-and-power.ts b/i18n/zh_CN/light-and-power.ts
deleted file mode 100644
index 9c4d055..0000000
--- a/i18n/zh_CN/light-and-power.ts
+++ b/dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Calibration</name>
-    <message>
-        <source>%1 Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LightSettingsBase</name>
-    <message>
-        <source>Light and Power Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on Battery</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light off after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dim light after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suspend after</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deactivate LCD only (does not suspend)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>set a fix value for backlight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Light Sensor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calibrate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced settings for light sensor handling</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>on AC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Warnings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Low power warning interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> %</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the low power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>At what battery level should the critical power warning pop up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>very low battery warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>critical power warning at</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SensorBase</name>
-    <message>
-        <source>Sensor Calibration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Off</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Light</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Steps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check interval</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/mailit.ts b/i18n/zh_CN/mailit.ts
deleted file mode 100644
index d61ee1d..0000000
--- a/i18n/zh_CN/mailit.ts
+++ b/dev/null
@@ -1,531 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddAtt</name>
-    <message>
-        <source>Attached</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>attach...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditAccount</name>
-    <message>
-        <source>Edit Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create new Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Account name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>POP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SMTP server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Synchronize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail Size (k)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailClient</name>
-    <message>
-        <source>Idle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get Mail in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>From</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must create an account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Main operation toolbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>getMail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>select account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click to download mail via all available accounts.
- Press and hold to select the desired account.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No account associated</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is no active account 
-associated to this mail
- it can not be downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EmailHandler</name>
-    <message>
-        <source>Could not locate all files in 
-mail with subject: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>
-Mail has NOT been sent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MailItWindow</name>
-    <message>
-        <source>Write mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Central view area</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mail not downloaded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail you have clicked 
-has not been downloaded yet.
- Would you like to do it now ?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PopClient</name>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error Occured</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Retrieving </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Completing message </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new Messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No new messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>The mail subject should be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you would like to send copies of your mail they can be entered here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter your mail text here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue your mail by clicking here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is an overview about all attachments in the mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the inbox view.
-It keeps the fetched mail which can be 
-viewed by double clicking the entry.
-blue attachment icon shows whether this 
-mailhas attachments.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is the outbox view.
-It keeps the queued mails to send which can be 
-reviewed by double clicking the entry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the recipients from this list</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ReadMail</name>
-    <message>
-        <source>&amp;View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attatchments</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to forward the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the previous mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read the next mail in the list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add attachments to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The mail view has 2 modes:
-&lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to download the selected mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>reply to mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail
-Press and hold for more options.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reply all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SmtpClient</name>
-    <message>
-        <source>DNS lookup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sent </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ViewAtt</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to install the attachment to your Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WriteMail</name>
-    <message>
-        <source>&amp;Mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enque mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subject:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attachment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to attach files to your mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This button puts your mail in the send queue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to create a new mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No recipient</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send mail to whom?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect recipient separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incorrect carbon copy separator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CC Recipients must be separated by ;
-and be valid emailaddresses</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======forwarded message from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> starts======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>FWD: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>======end of forwarded message======
-
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> wrote on </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/mediummount.ts b/i18n/zh_CN/mediummount.ts
deleted file mode 100644
index 77a2879..0000000
--- a/i18n/zh_CN/mediummount.ts
+++ b/dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Medium Mount Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Global</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/mindbreaker.ts b/i18n/zh_CN/mindbreaker.ts
deleted file mode 100644
index 598d561..0000000
--- a/i18n/zh_CN/mindbreaker.ts
+++ b/dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MindBreaker</name>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>win avg: %1 turns (%2 games)</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MindBreakerBoard</name>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset Statistics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset the win ratio?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/minesweep.ts b/i18n/zh_CN/minesweep.ts
deleted file mode 100644
index 1dd7e7f..0000000
--- a/i18n/zh_CN/minesweep.ts
+++ b/dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MineSweep</name>
-    <message>
-        <source>You won!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You exploded!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mine Hunt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beginner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Expert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/networksettings.ts b/i18n/zh_CN/networksettings.ts
deleted file mode 100644
index b7552a6..0000000
--- a/i18n/zh_CN/networksettings.ts
+++ b/dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AddConnection</name>
-    <message>
-        <source>Add Network Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Services</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Network Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Set Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/odict.ts b/i18n/zh_CN/odict.ts
deleted file mode 100644
index 5b587d8..0000000
--- a/i18n/zh_CN/odict.ts
+++ b/dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigDlg</name>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searchmethod</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ODict</name>
-    <message>
-        <source>OPIE-Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Query:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searchmethods</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ase sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Until Hit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parameter</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchMethodDlg</name>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dictionary file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Language 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Decollator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Language 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Searchmethod</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Searchmethod</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/oipkg.ts b/i18n/zh_CN/oipkg.ts
deleted file mode 100644
index 1f93af3..0000000
--- a/i18n/zh_CN/oipkg.ts
+++ b/dev/null
@@ -1,355 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>InstallDialog</name>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ipkg options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-depends</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-reinstall</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-removal-of-essential-packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>-force-overwrite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To install</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Package Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>feeds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ipkgfind&amp;killefiz</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Apply</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Setups</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Section</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Actions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, not installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Old version, new version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New version, old version installed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageListView</name>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettings</name>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PackageManagerSettingsBase</name>
-    <message>
-        <source>Package Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install destination:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link to root destination</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Used servers: (Highlighted feeds are active)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>link to /</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>volatile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>removeable</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PmIpkg</name>
-    <message>
-        <source>
-All done.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Removing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>please wait</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while removing </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while installing</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Description: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> on </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Destination: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Install to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RunWindow</name>
-    <message>
-        <source>running...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/opie-console.ts b/i18n/zh_CN/opie-console.ts
deleted file mode 100644
index 9cdeb11..0000000
--- a/i18n/zh_CN/opie-console.ts
+++ b/dev/null
@@ -1,855 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ATConfigDialog</name>
-    <message>
-        <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Init string </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset string </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect string </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dial time </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Number of tries </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>BTConfigWidget</name>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Or peer mac address</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConfigureBase</name>
-    <message>
-        <source>Configure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profile Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ConsoleConfigWidget</name>
-    <message>
-        <source>Command to execute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Value :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DialDialog</name>
-    <message>
-        <source>Enter number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>EditBase</name>
-    <message>
-        <source>Editor Base</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Look</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Foreground:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gray</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Micro</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileReceive</name>
-    <message>
-        <source>Could not start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileTransfer</name>
-    <message>
-        <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FunctionKeyboardConfig</name>
-    <message>
-        <source>Dimensions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit Key</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IOLayerBase</name>
-    <message>
-        <source>Speed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Flow control</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hardware</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Software</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Odd</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Even</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>6</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.5</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>115200 baud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>57600 baud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>38400 baud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>19200 baud</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>9600 baud</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IOSerial</name>
-    <message>
-        <source>Not connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IrdaConfigWidget</name>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Configure Profiles</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer file...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save history</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Record Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Keyboard...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New from Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scripts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Script</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ModemConfigWidget</name>
-    <message>
-        <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AT commands</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter number</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NoOptions</name>
-    <message>
-        <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ProfileEditorDialog</name>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local Console</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Opie Console</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Receive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer protocol</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ready</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Attention</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sending...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Receiving...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancelled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No error.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Incomplete transfer.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown error occured.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File has been sent.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File has been received.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profile name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Special Keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Z-Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Y-Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Serial</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local Console</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Keyboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SynchronizedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing number: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancelling...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching modem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initializing...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Turning off dialtone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dial number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line busy, redialing number</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection established</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dismiss</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SerialConfigWidget</name>
-    <message>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TerminalWidget</name>
-    <message>
-        <source>Terminal Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color scheme</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inbound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Outbound</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local echo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Line wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VT 100</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>VT 102</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Linux Console</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>X-Terminal</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>black on white</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>white on black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>green on black</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>orange on black</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/opie-sh.ts b/i18n/zh_CN/opie-sh.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/opie-sh.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/opie-write.ts b/i18n/zh_CN/opie-write.ts
deleted file mode 100644
index be81c52..0000000
--- a/i18n/zh_CN/opie-write.ts
+++ b/dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Underline</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Center</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QTextEdit</name>
-    <message>
-        <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/opieftp.ts b/i18n/zh_CN/opieftp.ts
deleted file mode 100644
index 8f9d52e..0000000
--- a/i18n/zh_CN/opieftp.ts
+++ b/dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>OpieFtp</name>
-    <message>
-        <source>OpieFtp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Upload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Make Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dir</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remote path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ftp</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please set the server info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to connect to
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to log in
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to upload
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot upload directories</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to download 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to list the directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to change directories
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to cd up
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to get working dir
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you really want to delete
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> ?
-It must be empty</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to make directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to remove directory
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to delete file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to rename file
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>That directory does not exist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Server name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sorry name already taken</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/opieirc.ts b/i18n/zh_CN/opieirc.ts
deleted file mode 100644
index 33ef781..0000000
--- a/i18n/zh_CN/opieirc.ts
+++ b/dev/null
@@ -1,510 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>IRCChannelTab</name>
-    <message>
-        <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel discussion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type your message here to participate in the channel discussion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CTCP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Query</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ping</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Version</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Whois</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCConnection</name>
-    <message>
-        <source>Connected, logging in ..</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Successfully logged in.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Socket error : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCMessageParser</name>
-    <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nonexistant channel join - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Person has already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Parting person not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel for part not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel message with unknown sender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received PRIVMSG of unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown person quit - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> changed topic to </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown channel topic - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received a CTCP PING from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CTCP ACTION with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CTCP ACTION with unknown channel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CTCP ACTION with bad recipient</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mode change has unknown type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mode change with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mode change with unknown flag</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mode change with unknown kannel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User modes not supported yet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You were kicked from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> was kicked from </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown person kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unknown channel kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server message with unknown channel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname is in use, please reconnect with a different nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No such nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCQueryTab</name>
-    <message>
-        <source>Talking to </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Private discussion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type your text here in order to send a message to the other person</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnected</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCServerEditor</name>
-    <message>
-        <source>Profile name :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of this server profile in the overview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hostname :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server to connect to - can be any valid host name or IP address</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The server port to connect to. Usually 6667</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your nick name on the IRC network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Realname :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your real name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password to connect to the server (if required)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Channels :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-Separated list of all channels you would like to join automatically</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit server information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profile name required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host name required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Port required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Realname required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The channel list needs to contain a
-comma separated list of channel
- names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCServerList</name>
-    <message>
-        <source>Serverlist Browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please choose a server profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete the currently selected server profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit the currently selected server profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add a new server profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCServerTab</name>
-    <message>
-        <source>Connection to</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server messages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCSettings</name>
-    <message>
-        <source>Lines displayed :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background color :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background color to be used in chats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Normal text color :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used in chats</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error color :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used to display errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text written by yourself :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used to identify text written by yourself</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text written by others :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used to identify text written by others</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text written by the server :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used to identify text written by the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notifications :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text color to be used to display notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>IRCTab</name>
-    <message>
-        <source>Missing description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description of the tab&apos;s content</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close this tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>IRC Client</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>IRC</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/opieplayer2.ts b/i18n/zh_CN/opieplayer2.ts
deleted file mode 100644
index 2b25e91..0000000
--- a/i18n/zh_CN/opieplayer2.ts
+++ b/dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AudioWidget</name>
-    <message>
-        <source>OpiePlayer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediaPlayer</name>
-    <message>
-        <source>OpiePlayer: Initializating</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> File: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>, Length: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Volume</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListFileView</name>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Media</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListSelection</name>
-    <message>
-        <source>Playlist Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidget</name>
-    <message>
-        <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Randomize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Loop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear List</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all video files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add all files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save Playlist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Play Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You really want to delete
-this playlist?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PlayListWidgetGui</name>
-    <message>
-        <source>Play Operations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Skins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gamma (Video)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lists</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>VideoWidget</name>
-    <message>
-        <source>OpiePlayer - Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>XineControl</name>
-    <message>
-        <source>Failure</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/oxygen.ts b/i18n/zh_CN/oxygen.ts
deleted file mode 100644
index ff83875..0000000
--- a/i18n/zh_CN/oxygen.ts
+++ b/dev/null
@@ -1,561 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CalcDlg</name>
-    <message>
-        <source>Molecular Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chemical Formula</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molecular Weight (u):</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Elemental Composition (%):</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OxydataWidget</name>
-    <message>
-        <source>%1 u</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 pm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 J</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 g/cm^3</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 K</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Electronegativity</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Atomic radius</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ionizationenergie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Density</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boilingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Oxygen</name>
-    <message>
-        <source>Oxygen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PSE</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calculations</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/parashoot.ts b/i18n/zh_CN/parashoot.ts
deleted file mode 100644
index 0aa33b9..0000000
--- a/i18n/zh_CN/parashoot.ts
+++ b/dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ParaShoot</name>
-    <message>
-        <source>ParaShoot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Game</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>     Level: %1       Score: %2   </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>       GAME OVER!
-       Your Score:  %1
- Parachuters Killed: %2
-        Accuracy: %3% </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/qasteroids.ts b/i18n/zh_CN/qasteroids.ts
deleted file mode 100644
index 7066645..0000000
--- a/i18n/zh_CN/qasteroids.ts
+++ b/dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KAstTopLevel</name>
-    <message>
-        <source>Asteroids</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Score</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Level</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ships</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fuel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Press Calendar to start playing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ship Destroyed.
-Press Contacts/Home key.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Game Over.
-Press Calendar for a new game.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/qcop.ts b/i18n/zh_CN/qcop.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/qcop.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/qpdf.ts b/i18n/zh_CN/qpdf.ts
deleted file mode 100644
index 2f03c32..0000000
--- a/i18n/zh_CN/qpdf.ts
+++ b/dev/null
@@ -1,101 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QPdfDlg</name>
-    <message>
-        <source>QPdf</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fit to page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>50%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>75%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>100%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>125%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>150%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>200%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select from 1 .. %1:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&apos;%1&apos; could not be found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File does not exist !</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/qpe.ts b/i18n/zh_CN/qpe.ts
deleted file mode 100644
index 56f6b51..0000000
--- a/i18n/zh_CN/qpe.ts
+++ b/dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Calibrate</name>
-    <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Launcher</name>
-    <message>
-        <source>Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Finding documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> - Launcher</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LauncherView</name>
-    <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Document View</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShutdownImpl</name>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reboot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shutdown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncAuthentication</name>
-    <message>
-        <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SyncDialog</name>
-    <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/reader.ts b/i18n/zh_CN/reader.ts
deleted file mode 100644
index 3842246..0000000
--- a/i18n/zh_CN/reader.ts
+++ b/dev/null
@@ -1,308 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>QTReaderApp</name>
-    <message>
-        <source>Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>On Action...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fullscreen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Navigation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Jump</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page/Line Scroll</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Overlap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use Cursor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Two/One Touch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Target</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dictionary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clipboard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continuous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Markup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Peanut/PML</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Strip CR</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dehyphen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Single Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unindent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-paragraph</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Double Space</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent+</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Indent-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Repalm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Embolden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom In</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ideogram/Word</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ascii</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UTF-8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UCS-2(BE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>USC-2(LE)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Palm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Windows(1252)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Annotate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Goto</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Autogen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tidy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Marks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find Next</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do Reg</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>fileBrowser</name>
-    <message>
-        <source>Browse for file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>/</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hidden</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/remote.ts b/i18n/zh_CN/remote.ts
deleted file mode 100644
index 0314a85..0000000
--- a/i18n/zh_CN/remote.ts
+++ b/dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>MainView</name>
-    <message>
-        <source>Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Help</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/security.ts b/i18n/zh_CN/security.ts
deleted file mode 100644
index 82edfac..0000000
--- a/i18n/zh_CN/security.ts
+++ b/dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/sfcave-sdl.ts b/i18n/zh_CN/sfcave-sdl.ts
deleted file mode 100644
index 4eb9e18..0000000
--- a/i18n/zh_CN/sfcave-sdl.ts
+++ b/dev/null
@@ -1,2 +0,0 @@
-<!DOCTYPE TS><TS>
-</TS>
diff --git a/i18n/zh_CN/sheetqt.ts b/i18n/zh_CN/sheetqt.ts
deleted file mode 100644
index 6a05307..0000000
--- a/i18n/zh_CN/sheetqt.ts
+++ b/dev/null
@@ -1,787 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>CellFormat</name>
-    <message>
-        <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FindDialog</name>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Row Height</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Column Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hide Column</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Functions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.2
-Release Date: October 08, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sheet</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Sheet</name>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SortDialog</name>
-    <message>
-        <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sort</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/systemtime.ts b/i18n/zh_CN/systemtime.ts
deleted file mode 100644
index c68c7e9..0000000
--- a/i18n/zh_CN/systemtime.ts
+++ b/dev/null
@@ -1,250 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>FormatTabWidget</name>
-    <message>
-        <source>Time format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12/24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <source>SystemTime</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Running:
-ntpdate </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error while getting time from
- server: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NTPTabWidget</name>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PredictTabWidget</name>
-    <message>
-        <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>n/a</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last [h]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SettingsTabWidget</name>
-    <message>
-        <source>Time server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display time server information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TimeTabWidget</name>
-    <message>
-        <source>Hour</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Time zone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/i18n/zh_CN/wellenreiter.ts b/i18n/zh_CN/wellenreiter.ts
deleted file mode 100644
index e69de29..0000000
--- a/i18n/zh_CN/wellenreiter.ts
+++ b/dev/null
diff --git a/i18n/zh_TW/.directory b/i18n/zh_TW/.directory
index beaa5fd..42b7085 100644
--- a/i18n/zh_TW/.directory
+++ b/i18n/zh_TW/.directory
@@ -1,12 +1,14 @@
 [Desktop Entry]
 Name=Traditional Chinese
 Name[da]=Kinesisk, traditionelt
 Name[es]=Chino Tradicional
 Name[hu]=Kínai (hagyományos)
 Name[it]=Cinese Tradizionale
 Name[ja]=伝統的中国語
 Name[no]=Kinesisk(Tradisjonell)
 Name[pt]=Chinês Tradicional
 Name[pt_BR]=Chinês Tradicional
 Name[sl]=Tradicionalna kitajščina
 Name[zh_TW]=繁體中文
+Name[de]=traditionelles Chinesisch
+Name[nl]=Traditioneel Chinees
\ No newline at end of file
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 7fb96dc..448606f 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,1399 +1,1506 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
-        <translation >全名</translation>
+        <translation>全名</translation>
     </message>
     <message>
         <source>Contact</source>
-        <translation >聯絡人</translation>
+        <translation>聯絡人</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>選取</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>聯絡人</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation >刪除</translation>
+        <translation>刪除</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation >搜尋</translation>
+        <translation>搜尋</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>寫電郵給</translation>
     </message>
     <message>
         <source>Beam Entry</source>
-        <translation >傳送項目</translation>
+        <translation>傳送項目</translation>
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation >個人資料</translation>
+        <translation>個人資料</translation>
     </message>
-   
-   
-   <message>
+    <message>
         <source>View</source>
-        <translation  ></translation>
+        <translation></translation>
     </message>
-    
-    
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation  ></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
-        <translation  >編輯個人資料</translation>
+        <translation>編輯個人資料</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation  >編輯地址</translation>
+        <translation>編輯地址</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
-        <translation  >聯絡人 - 個人資料"</translation>
+        <translation>聯絡人 - 個人資料&quot;</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation  >儲存空間不足</translation>
+        <translation>儲存空間不足</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
-        <translation  >無法儲存資料
+        <translation>無法儲存資料
 請先釋放些儲存空間後再試一次
 退出?
 </translation>
     </message>
     <message>
         <source>All</source>
-        <translation  >全部</translation>
+        <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation  >未歸檔</translation>
+        <translation>未歸檔</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation  >輸入 cVard</translation>
+        <translation>輸入 cVard</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation  >關閉搜尋</translation>
+        <translation>關閉搜尋</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation  >儲存所有資料</translation>
+        <translation>儲存所有資料</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation  >設定</translation>
-    </message>
-    <message>
-        <source>OContacts</source>
-        <translation  >聯絡人</translation>
+        <translation>設定</translation>
     </message>
     <message>
         <source>Not Found</source>
-        <translation  >未找到</translation>
+        <translation>未找到</translation>
     </message>
     <message>
         <source>List</source>
-        <translation  >列出</translation>
+        <translation>列出</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation  >名片</translation>
+        <translation>名片</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation  >名片</translation>
+        <translation>名片</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation  >開始搜尋</translation>
+        <translation>開始搜尋</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation  >是正確檔案類型嘛?</translation>
+        <translation>是正確檔案類型嘛?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation  >&amp;是</translation>
+        <translation>&amp;是</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation  >&amp;否</translation>
+        <translation>&amp;否</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation  >無法找到此型態的聯絡人</translation>
+        <source>Unable to find a contact for this search pattern!</source>
+        <translation>無法找到此型態的聯絡人</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-        <translation  >選擇的檔案不是以&quot;.vcf&quot;結束.確定要開啟?</translation>
+        <translation>選擇的檔案不是以&quot;.vcf&quot;結束.確定要開啟?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
-        <translation  >新增聯絡人?</translation>
+        <translation>新增聯絡人?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
-        <translation  >確定要在%1加入聯絡人?</translation>
+        <translation>確定要在%1加入聯絡人?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
-        <translation  >&amp;全部都是</translation>
+        <translation>&amp;全部都是</translation>
+    </message>
+    <message>
+        <source>Export vCard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to select a contact !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have to set a filename !</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
-        <translation  >查詢樣式</translation>
+        <translation>查詢樣式</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
-        <translation  >使用一般的表達方式</translation>
+        <translation>使用一般的表達方式</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
-        <translation  >使用萬用字元(*,?)</translation>
+        <translation>使用萬用字元(*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation  >大小寫不同</translation>
+        <translation>大小寫不同</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation  >郵件</translation>
+        <translation>郵件</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
-        <translation  >採用QT-Mail</translation>
+        <translation>採用QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
-        <translation  >採用Opie-Mail</translation>
+        <translation>採用Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation  >注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
+        <translation>注意: QT-Maily僅在Sharp的預設ROM中提供.Opie-Mail可免費安裝 </translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation  >其他</translation>
+        <translation>其他</translation>
     </message>
     <message>
         <source>Search Settings</source>
-        <translation  >搜尋之設定</translation>
+        <translation>搜尋之設定</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation  >字型</translation>
+        <translation>字型</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation  >小</translation>
+        <translation>小</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation  >一般</translation>
+        <translation>一般</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation  >大</translation>
+        <translation>大</translation>
     </message>
     <message>
         <source>Order</source>
-        <translation  >順序</translation>
+        <translation>順序</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation  >選擇聯絡人順序</translation>
+        <translation>選擇聯絡人順序</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation  >上移</translation>
+        <translation>上移</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation  >下移</translation>
+        <translation>下移</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation  >增加</translation>
+        <translation>增加</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation  >移除</translation>
+        <translation>移除</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation  >設定</translation>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <source>Click on tab to select one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings for the search query style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search widget expects regular expressions if selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search widget just expects simple wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If selected, search differs between upper and lower chars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font size for list- and card view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tool-/Menubar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fixed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to fixed menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Moveable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to moveable menu-/toolbars after restarting application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fontsettings for list and card view</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Sharp&apos;s mail application if available</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use OPIE mail if installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected attribute one line up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selected attribute one line down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List of all available attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add selected attribute from list below to the upper list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the selected attribute from the upper list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
-        <translation  >名</translation>
+        <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation  >中名</translation>
+        <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation  >姓</translation>
+        <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation  >Suffix</translation>
+        <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation  >歸檔為</translation>
+        <translation>歸檔為</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation  >性別</translation>
+        <translation>性別</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation  >職稱</translation>
+        <translation>職稱</translation>
     </message>
     <message>
         <source>City</source>
-        <translation  >城市</translation>
+        <translation>城市</translation>
     </message>
     <message>
         <source>State</source>
-        <translation  >州</translation>
+        <translation>州</translation>
     </message>
     <message>
         <source>Country</source>
-        <translation  >國家</translation>
+        <translation>國家</translation>
     </message>
     <message>
         <source>Full Name...</source>
-        <translation  >全名...</translation>
+        <translation>全名...</translation>
     </message>
     <message>
         <source>Organization</source>
-        <translation  >組織</translation>
+        <translation>組織</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation  >類別</translation>
+        <translation>類別</translation>
     </message>
     <message>
         <source>Notes...</source>
-        <translation  >註解...</translation>
+        <translation>註解...</translation>
     </message>
     <message>
         <source>General</source>
-        <translation  >一般</translation>
+        <translation>一般</translation>
     </message>
     <message>
         <source>Business</source>
-        <translation  >商務</translation>
+        <translation>商務</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation  >住家</translation>
+        <translation>住家</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation  >住址</translation>
+        <translation>住址</translation>
     </message>
     <message>
         <source>Zip Code</source>
-        <translation  >郵遞區號</translation>
+        <translation>郵遞區號</translation>
     </message>
     <message>
         <source>United States</source>
-        <translation  >美國</translation>
+        <translation>美國</translation>
     </message>
     <message>
         <source>United Kingdom</source>
-        <translation  >英國</translation>
+        <translation>英國</translation>
     </message>
     <message>
         <source>Japan</source>
-        <translation  >日本</translation>
+        <translation>日本</translation>
     </message>
     <message>
         <source>France</source>
-        <translation  >法國</translation>
+        <translation>法國</translation>
     </message>
     <message>
         <source>Germany</source>
-        <translation  >德國</translation>
+        <translation>德國</translation>
     </message>
     <message>
         <source>Norway</source>
-        <translation  >挪威</translation>
+        <translation>挪威</translation>
     </message>
     <message>
         <source>Canada</source>
-        <translation  >加拿大</translation>
+        <translation>加拿大</translation>
     </message>
     <message>
         <source>Male</source>
-        <translation  >男性</translation>
+        <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation  >女性</translation>
+        <translation>女性</translation>
     </message>
     <message>
         <source>Details</source>
-        <translation  >細項</translation>
+        <translation>細項</translation>
     </message>
     <message>
         <source>Enter Note</source>
-        <translation  >輸入註解</translation>
+        <translation>輸入註解</translation>
     </message>
     <message>
         <source>Edit Name</source>
-        <translation  >編輯姓名</translation>
+        <translation>編輯姓名</translation>
     </message>
     <message>
         <source>Contacts</source>
-        <translation  >聯絡人</translation>
-    </message>
-    <message>
-        <source>Afganistan</source>
-        <translation  >阿富汗</translation>
+        <translation>聯絡人</translation>
     </message>
     <message>
         <source>Albania</source>
-        <translation  >阿爾巴尼亞</translation>
+        <translation>阿爾巴尼亞</translation>
     </message>
     <message>
         <source>Algeria</source>
-        <translation  >阿爾及利亞</translation>
+        <translation>阿爾及利亞</translation>
     </message>
     <message>
         <source>American Samoa</source>
-        <translation  >美屬薩摩亞</translation>
+        <translation>美屬薩摩亞</translation>
     </message>
     <message>
         <source>Andorra</source>
-        <translation  >安道爾共和國</translation>
+        <translation>安道爾共和國</translation>
     </message>
     <message>
         <source>Angola</source>
-        <translation  >安哥拉</translation>
+        <translation>安哥拉</translation>
     </message>
     <message>
         <source>Anguilla</source>
-        <translation  >安圭拉島</translation>
-    </message>
-    <message>
-        <source>Antartica</source>
-        <translation  >南極圈</translation>
+        <translation>安圭拉島</translation>
     </message>
     <message>
         <source>Argentina</source>
-        <translation  >阿根廷</translation>
-    </message>
-    <message>
-        <source>Armania</source>
-        <translation  >Armania</translation>
+        <translation>阿根廷</translation>
     </message>
     <message>
         <source>Aruba</source>
-        <translation  >Aruba</translation>
+        <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
-        <translation  >澳洲</translation>
+        <translation>澳洲</translation>
     </message>
     <message>
         <source>Austria</source>
-        <translation  >奧地利</translation>
+        <translation>奧地利</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
-        <translation  >亞塞拜然</translation>
+        <translation>亞塞拜然</translation>
     </message>
     <message>
         <source>Bahamas</source>
-        <translation  >巴哈馬</translation>
+        <translation>巴哈馬</translation>
     </message>
     <message>
         <source>Bahrain</source>
-        <translation  >巴林</translation>
+        <translation>巴林</translation>
     </message>
     <message>
         <source>Bangladesh</source>
-        <translation  >孟加拉共和國</translation>
+        <translation>孟加拉共和國</translation>
     </message>
     <message>
         <source>Barbados</source>
-        <translation  >巴貝多</translation>
+        <translation>巴貝多</translation>
     </message>
     <message>
         <source>Belarus</source>
-        <translation  >比利時人</translation>
+        <translation>比利時人</translation>
     </message>
     <message>
         <source>Belgium</source>
-        <translation  >比利時</translation>
+        <translation>比利時</translation>
     </message>
     <message>
         <source>Belize</source>
-        <translation  >貝里斯</translation>
+        <translation>貝里斯</translation>
     </message>
     <message>
         <source>Benin</source>
-        <translation  >貝南</translation>
+        <translation>貝南</translation>
     </message>
     <message>
         <source>Bermuda</source>
-        <translation  >百慕達(群島)</translation>
+        <translation>百慕達(群島)</translation>
     </message>
     <message>
         <source>Bhutan</source>
-        <translation  >不丹</translation>
-    </message>
-    <message>
-        <source>Boliva</source>
-        <translation  >委內瑞拉銀幣</translation>
+        <translation>不丹</translation>
     </message>
     <message>
         <source>Botswana</source>
-        <translation  >波紮那</translation>
+        <translation>波紮那</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
-        <translation  >Bouvet Island</translation>
+        <translation>Bouvet Island</translation>
     </message>
     <message>
         <source>Brazil</source>
-        <translation  >巴西</translation>
+        <translation>巴西</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation  >文萊></translation>
+        <translation>文萊&gt;</translation>
     </message>
     <message>
         <source>Bulgaria</source>
-        <translation  >保加利亞</translation>
+        <translation>保加利亞</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
-        <translation  >布基那法索國</translation>
+        <translation>布基那法索國</translation>
     </message>
     <message>
         <source>Burundi</source>
-        <translation  >蒲隆地</translation>
+        <translation>蒲隆地</translation>
     </message>
     <message>
         <source>Cambodia</source>
-        <translation  >柬埔寨</translation>
-    </message>
-    <message>
-        <source>Camaroon</source>
-        <translation  >喀麥隆</translation>
+        <translation>柬埔寨</translation>
     </message>
     <message>
         <source>Cape Verde</source>
-        <translation  >開普</translation>
+        <translation>開普</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
-        <translation  >卡宴</translation>
+        <translation>卡宴</translation>
     </message>
     <message>
         <source>Chad</source>
-        <translation  >查德</translation>
+        <translation>查德</translation>
     </message>
     <message>
         <source>Chile</source>
-        <translation  >智利</translation>
+        <translation>智利</translation>
     </message>
     <message>
         <source>China</source>
-        <translation  >中國大陸</translation>
+        <translation>中國大陸</translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation>Chrismas Island</translation>
     </message>
     <message>
         <source>Colombia</source>
-        <translation  >歌倫比亞</translation>
+        <translation>歌倫比亞</translation>
     </message>
     <message>
         <source>Comoros</source>
-        <translation  >科摩洛</translation>
+        <translation>科摩洛</translation>
     </message>
     <message>
         <source>Congo</source>
-        <translation  >剛果</translation>
+        <translation>剛果</translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation  >Cook Island</translation>
+        <translation>Cook Island</translation>
     </message>
     <message>
         <source>Costa Rica</source>
-        <translation  >哥斯大黎加</translation>
+        <translation>哥斯大黎加</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation  >科都努</translation>
+        <translation>科都努</translation>
     </message>
     <message>
         <source>Croatia</source>
-        <translation  >克羅埃西亞共和國</translation>
+        <translation>克羅埃西亞共和國</translation>
     </message>
     <message>
         <source>Cuba</source>
-        <translation  >古巴</translation>
+        <translation>古巴</translation>
     </message>
     <message>
         <source>Cyprus</source>
-        <translation  >塞普勒斯</translation>
+        <translation>塞普勒斯</translation>
     </message>
     <message>
         <source>Czech Republic</source>
-        <translation  >捷克</translation>
+        <translation>捷克</translation>
     </message>
     <message>
         <source>Denmark</source>
-        <translation  >丹麥</translation>
+        <translation>丹麥</translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation  >吉布地</translation>
+        <translation>吉布地</translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation  >多米尼克</translation>
+        <translation>多米尼克</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
-        <translation  >多明尼加共和國</translation>
+        <translation>多明尼加共和國</translation>
     </message>
     <message>
         <source>East Timor</source>
-        <translation  >East Timor</translation>
+        <translation>East Timor</translation>
     </message>
     <message>
         <source>Ecuador</source>
-        <translation  >厄瓜多爾</translation>
+        <translation>厄瓜多爾</translation>
     </message>
     <message>
         <source>Egypt</source>
-        <translation  >埃及</translation>
+        <translation>埃及</translation>
     </message>
     <message>
         <source>El Salvador</source>
-        <translation  >薩爾瓦多</translation>
+        <translation>薩爾瓦多</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
-        <translation  >赤道幾內亞</translation>
+        <translation>赤道幾內亞</translation>
     </message>
     <message>
         <source>Eritrea</source>
-        <translation  >厄立特里亞</translation>
+        <translation>厄立特里亞</translation>
     </message>
     <message>
         <source>Estonia</source>
-        <translation  >愛沙尼亞</translation>
+        <translation>愛沙尼亞</translation>
     </message>
     <message>
         <source>Ethiopia</source>
-        <translation  >衣索比亞</translation>
+        <translation>衣索比亞</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation  >(英屬)福克蘭群島</translation>
+        <translation>(英屬)福克蘭群島</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation  >法羅群島</translation>
+        <translation>法羅群島</translation>
     </message>
     <message>
         <source>Fiji</source>
-        <translation  >斐濟</translation>
+        <translation>斐濟</translation>
     </message>
     <message>
         <source>Finland</source>
-        <translation  >芬蘭</translation>
+        <translation>芬蘭</translation>
     </message>
     <message>
         <source>French Guiana</source>
-        <translation  >法屬圭亞那</translation>
+        <translation>法屬圭亞那</translation>
     </message>
     <message>
         <source>French Polynesia</source>
-        <translation  >玻里尼西亞</translation>
+        <translation>玻里尼西亞</translation>
     </message>
     <message>
         <source>Gabon</source>
-        <translation  >加彭</translation>
+        <translation>加彭</translation>
     </message>
     <message>
         <source>Gambia</source>
-        <translation  >甘比亞</translation>
+        <translation>甘比亞</translation>
     </message>
     <message>
         <source>Georgia</source>
-        <translation  >喬治亞</translation>
-    </message>
-    <message>
-        <source>Gahna</source>
-        <translation  >甘那</translation>
+        <translation>喬治亞</translation>
     </message>
     <message>
         <source>Gibraltar</source>
-        <translation  >直布羅陀</translation>
+        <translation>直布羅陀</translation>
     </message>
     <message>
         <source>Greece</source>
-        <translation  >希臘</translation>
+        <translation>希臘</translation>
     </message>
     <message>
         <source>Greenland</source>
-        <translation  >格林蘭島</translation>
+        <translation>格林蘭島</translation>
     </message>
     <message>
         <source>Grenada</source>
-        <translation  >格瑞納達</translation>
-    </message>
-    <message>
-        <source>Guadelupe</source>
-        <translation  >哥德洛普島</translation>
+        <translation>格瑞納達</translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation  >關島</translation>
+        <translation>關島</translation>
     </message>
     <message>
         <source>Guatemala</source>
-        <translation  >瓜地馬拉</translation>
+        <translation>瓜地馬拉</translation>
     </message>
     <message>
         <source>Guinea</source>
-        <translation  >幾內亞</translation>
-    </message>
-    <message>
-        <source>Guinea-bissau</source>
-        <translation  >幾內亞比紹</translation>
+        <translation>幾內亞</translation>
     </message>
     <message>
         <source>Guyana</source>
-        <translation  >蓋亞那</translation>
+        <translation>蓋亞那</translation>
     </message>
     <message>
         <source>Haiti</source>
-        <translation  >海地</translation>
+        <translation>海地</translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation  >羅馬教廷</translation>
+        <translation>羅馬教廷</translation>
     </message>
     <message>
         <source>Honduras</source>
-        <translation  >宏都拉斯</translation>
+        <translation>宏都拉斯</translation>
     </message>
     <message>
         <source>Hong Kong</source>
-        <translation  >香港</translation>
+        <translation>香港</translation>
     </message>
     <message>
         <source>Hungary</source>
-        <translation  >匈牙利</translation>
+        <translation>匈牙利</translation>
     </message>
     <message>
         <source>Iceland</source>
-        <translation  >冰島</translation>
+        <translation>冰島</translation>
     </message>
     <message>
         <source>India</source>
-        <translation  >印度</translation>
+        <translation>印度</translation>
     </message>
     <message>
         <source>Indonesia</source>
-        <translation  >印尼</translation>
+        <translation>印尼</translation>
     </message>
     <message>
         <source>Ireland</source>
-        <translation  >愛爾蘭</translation>
+        <translation>愛爾蘭</translation>
     </message>
     <message>
         <source>Israel</source>
-        <translation  >以色列</translation>
+        <translation>以色列</translation>
     </message>
     <message>
         <source>Italy</source>
-        <translation  >義大利</translation>
-    </message>
-    <message>
-        <source>Jamacia</source>
-        <translation  >牙買加</translation>
+        <translation>義大利</translation>
     </message>
     <message>
         <source>Jordan</source>
-        <translation  >約旦</translation>
+        <translation>約旦</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
-        <translation  >哈薩克</translation>
+        <translation>哈薩克</translation>
     </message>
     <message>
         <source>Kenya</source>
-        <translation  >肯亞</translation>
-    </message>
-    <message>
-        <source>Kribati</source>
-        <translation  >魁巴地</translation>
+        <translation>肯亞</translation>
     </message>
     <message>
         <source>Korea</source>
-        <translation  >韓國</translation>
+        <translation>韓國</translation>
     </message>
     <message>
         <source>Laos</source>
-        <translation  >寮國</translation>
+        <translation>寮國</translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation  >拉脫維亞</translation>
+        <translation>拉脫維亞</translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation  >黎巴嫩</translation>
+        <translation>黎巴嫩</translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation  >賴索托</translation>
+        <translation>賴索托</translation>
     </message>
     <message>
         <source>Liberia</source>
-        <translation  > 賴比瑞亞</translation>
+        <translation> 賴比瑞亞</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
-        <translation  >列支敦斯登</translation>
+        <translation>列支敦斯登</translation>
     </message>
     <message>
         <source>Lithuania</source>
-        <translation  >立陶宛</translation>
+        <translation>立陶宛</translation>
     </message>
     <message>
         <source>Luxembourg</source>
-        <translation  >盧森堡</translation>
+        <translation>盧森堡</translation>
     </message>
     <message>
         <source>Macau</source>
-        <translation  >澳門</translation>
+        <translation>澳門</translation>
     </message>
     <message>
         <source>Macedonia</source>
-        <translation  >馬其頓</translation>
+        <translation>馬其頓</translation>
     </message>
     <message>
         <source>Madagascar</source>
-        <translation  >馬達加斯加</translation>
+        <translation>馬達加斯加</translation>
     </message>
     <message>
         <source>Malawi</source>
-        <translation  >馬拉威</translation>
+        <translation>馬拉威</translation>
     </message>
     <message>
         <source>Malaysia</source>
-        <translation  >馬來西亞</translation>
+        <translation>馬來西亞</translation>
     </message>
     <message>
         <source>Maldives</source>
-        <translation  >馬爾地夫</translation>
+        <translation>馬爾地夫</translation>
     </message>
     <message>
         <source>Mali</source>
-        <translation  >馬利</translation>
+        <translation>馬利</translation>
     </message>
     <message>
         <source>Malta</source>
-        <translation  >馬爾他</translation>
+        <translation>馬爾他</translation>
     </message>
     <message>
         <source>Martinique</source>
-        <translation  >馬丁尼克</translation>
+        <translation>馬丁尼克</translation>
     </message>
     <message>
         <source>Mauritania</source>
-        <translation  >茅利塔尼亞</translation>
+        <translation>茅利塔尼亞</translation>
     </message>
     <message>
         <source>Mauritius</source>
-        <translation  >模里西斯</translation>
+        <translation>模里西斯</translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation  >馬優特</translation>
+        <translation>馬優特</translation>
     </message>
     <message>
         <source>Mexico</source>
-        <translation  >墨西哥</translation>
+        <translation>墨西哥</translation>
     </message>
     <message>
         <source>Micronesia</source>
-        <translation  >密克羅西尼亞</translation>
+        <translation>密克羅西尼亞</translation>
     </message>
     <message>
         <source>Moldova</source>
-        <translation  >摩爾達維亞</translation>
+        <translation>摩爾達維亞</translation>
     </message>
     <message>
         <source>Monaco</source>
-        <translation  >摩納哥</translation>
+        <translation>摩納哥</translation>
     </message>
     <message>
         <source>Mongolia</source>
-        <translation  >蒙古</translation>
+        <translation>蒙古</translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation  >蒙特色拉特</translation>
+        <translation>蒙特色拉特</translation>
     </message>
     <message>
         <source>Morocco</source>
-        <translation  >摩洛哥</translation>
+        <translation>摩洛哥</translation>
     </message>
     <message>
         <source>Mozambique</source>
-        <translation  >莫三比克</translation>
+        <translation>莫三比克</translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation  >緬甸</translation>
+        <translation>緬甸</translation>
     </message>
     <message>
         <source>Namibia</source>
-        <translation  >那米比亞</translation>
+        <translation>那米比亞</translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation  >諾魯</translation>
+        <translation>諾魯</translation>
     </message>
     <message>
         <source>Nepal</source>
-        <translation  >尼泊爾</translation>
+        <translation>尼泊爾</translation>
     </message>
     <message>
         <source>Netherlands</source>
-        <translation  >荷蘭</translation>
+        <translation>荷蘭</translation>
     </message>
     <message>
         <source>New Caledonia</source>
-        <translation  >新加勒多尼亞</translation>
+        <translation>新加勒多尼亞</translation>
     </message>
     <message>
         <source>New Zealand</source>
-        <translation  >紐西蘭</translation>
+        <translation>紐西蘭</translation>
     </message>
     <message>
         <source>Nicaragua</source>
-        <translation  >尼加拉瓜</translation>
+        <translation>尼加拉瓜</translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation  >尼日</translation>
+        <translation>尼日</translation>
     </message>
     <message>
         <source>Nigeria</source>
-        <translation  >奈及利亞</translation>
+        <translation>奈及利亞</translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation  >Niue</translation>
+        <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
-        <translation  >阿曼</translation>
+        <translation>阿曼</translation>
     </message>
     <message>
         <source>Pakistan</source>
-        <translation  >巴基斯坦</translation>
+        <translation>巴基斯坦</translation>
     </message>
     <message>
         <source>Palau</source>
-        <translation  >Palau</translation>
-    </message>
-    <message>
-        <source>Palestinian Territory</source>
-        <translation  >巴勒斯坦地區</translation>
+        <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
-        <translation  >巴拿馬</translation>
+        <translation>巴拿馬</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
-        <translation  >巴布亞島新幾內亞島</translation>
+        <translation>巴布亞島新幾內亞島</translation>
     </message>
     <message>
         <source>Paraguay</source>
-        <translation  >巴拉圭</translation>
+        <translation>巴拉圭</translation>
     </message>
     <message>
         <source>Peru</source>
-        <translation  >祕魯</translation>
+        <translation>祕魯</translation>
     </message>
     <message>
         <source>Philippines</source>
-        <translation  >菲律賓</translation>
-    </message>
-    <message>
-        <source>Pitcairn</source>
-        <translation  >Pitcairn</translation>
+        <translation>菲律賓</translation>
     </message>
     <message>
         <source>Poland</source>
-        <translation  >波蘭</translation>
+        <translation>波蘭</translation>
     </message>
     <message>
         <source>Portugal</source>
-        <translation  >葡萄牙</translation>
+        <translation>葡萄牙</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
-        <translation  >波多黎各</translation>
+        <translation>波多黎各</translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation  >卡達</translation>
+        <translation>卡達</translation>
     </message>
     <message>
         <source>Reunion</source>
-        <translation  >留尼旺島</translation>
+        <translation>留尼旺島</translation>
     </message>
     <message>
         <source>Romania</source>
-        <translation  >羅馬尼亞</translation>
+        <translation>羅馬尼亞</translation>
     </message>
     <message>
         <source>Russia</source>
-        <translation  >俄羅斯</translation>
+        <translation>俄羅斯</translation>
     </message>
     <message>
         <source>Rwanda</source>
-        <translation  >盧安達</translation>
+        <translation>盧安達</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
-        <translation  >聖路西亞</translation>
+        <translation>聖路西亞</translation>
     </message>
     <message>
         <source>Samoa</source>
-        <translation  >薩摩亞</translation>
+        <translation>薩摩亞</translation>
     </message>
     <message>
         <source>San Marino</source>
-        <translation  >聖馬利諾</translation>
+        <translation>聖馬利諾</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
-        <translation  >沙烏地阿拉伯</translation>
+        <translation>沙烏地阿拉伯</translation>
     </message>
     <message>
         <source>Senegal</source>
-        <translation  >塞內加爾</translation>
+        <translation>塞內加爾</translation>
     </message>
     <message>
         <source>Seychelles</source>
-        <translation  >塞席爾群島</translation>
+        <translation>塞席爾群島</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
-        <translation  >獅子山</translation>
+        <translation>獅子山</translation>
     </message>
     <message>
         <source>Singapore</source>
-        <translation  >新加坡</translation>
+        <translation>新加坡</translation>
     </message>
     <message>
         <source>Slovakia</source>
-        <translation  >斯洛伐克</translation>
+        <translation>斯洛伐克</translation>
     </message>
     <message>
         <source>Slovenia</source>
-        <translation  >斯洛維尼亞共和國</translation>
+        <translation>斯洛維尼亞共和國</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
-        <translation  >所羅門群島</translation>
+        <translation>所羅門群島</translation>
     </message>
     <message>
         <source>Somalia</source>
-        <translation  >索馬利亞</translation>
+        <translation>索馬利亞</translation>
     </message>
     <message>
         <source>South Africa</source>
-        <translation  >南非</translation>
+        <translation>南非</translation>
     </message>
     <message>
         <source>Spain</source>
-        <translation  >西班牙</translation>
+        <translation>西班牙</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
-        <translation  >斯里蘭卡</translation>
+        <translation>斯里蘭卡</translation>
     </message>
     <message>
         <source>St. Helena</source>
-        <translation  >聖海倫娜</translation>
+        <translation>聖海倫娜</translation>
     </message>
     <message>
         <source>Sudan</source>
-        <translation  >蘇丹</translation>
+        <translation>蘇丹</translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation  >蘇利南莫河</translation>
+        <translation>蘇利南莫河</translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation  >史瓦濟蘭</translation>
+        <translation>史瓦濟蘭</translation>
     </message>
     <message>
         <source>Sweden</source>
-        <translation  >瑞典</translation>
+        <translation>瑞典</translation>
     </message>
     <message>
         <source>Switzerland</source>
-        <translation  >瑞士</translation>
+        <translation>瑞士</translation>
     </message>
     <message>
         <source>Taiwan</source>
-        <translation  >臺灣</translation>
+        <translation>臺灣</translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation  >塔吉克</translation>
+        <translation>塔吉克</translation>
     </message>
     <message>
         <source>Tanzania</source>
-        <translation  >坦尚尼亞</translation>
+        <translation>坦尚尼亞</translation>
     </message>
     <message>
         <source>Thailand</source>
-        <translation  >泰國</translation>
+        <translation>泰國</translation>
     </message>
     <message>
         <source>Togo</source>
-        <translation  >多哥</translation>
+        <translation>多哥</translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation  >Tokelau</translation>
+        <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation  >東加</translation>
+        <translation>東加</translation>
     </message>
     <message>
         <source>Tunisia</source>
-        <translation  >突尼西亞</translation>
+        <translation>突尼西亞</translation>
     </message>
     <message>
         <source>Turkey</source>
-        <translation  >土耳其</translation>
+        <translation>土耳其</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation  >土庫曼</translation>
+        <translation>土庫曼</translation>
     </message>
     <message>
         <source>Tuvalu</source>
-        <translation  >吐瓦魯</translation>
+        <translation>吐瓦魯</translation>
     </message>
     <message>
         <source>Uganda</source>
-        <translation  >烏干達</translation>
+        <translation>烏干達</translation>
     </message>
     <message>
         <source>Ukraine</source>
-        <translation  >烏克蘭</translation>
+        <translation>烏克蘭</translation>
     </message>
     <message>
         <source>Uruguay</source>
-        <translation  >烏拉圭</translation>
+        <translation>烏拉圭</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation  >烏茲別克斯坦</translation>
+        <translation>烏茲別克斯坦</translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation  >萬那杜</translation>
+        <translation>萬那杜</translation>
     </message>
     <message>
         <source>Venezuela</source>
-        <translation  >委內瑞拉</translation>
-    </message>
-    <message>
-        <source>Viet Nam</source>
-        <translation  >越南</translation>
+        <translation>委內瑞拉</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
-        <translation  >維京群島</translation>
+        <translation>維京群島</translation>
     </message>
     <message>
         <source>Western Sahara</source>
-        <translation  >西撒阿拉</translation>
+        <translation>西撒阿拉</translation>
     </message>
     <message>
         <source>Yemen</source>
-        <translation  >葉門</translation>
+        <translation>葉門</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
-        <translation  >南斯拉夫</translation>
+        <translation>南斯拉夫</translation>
     </message>
     <message>
         <source>Zambia</source>
-        <translation  >尚比亞</translation>
+        <translation>尚比亞</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
-        <translation  >辛巴威</translation>
+        <translation>辛巴威</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation  >生日</translation>
+        <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation  >週年紀念日</translation>
+        <translation>週年紀念日</translation>
     </message>
     <message>
         <source>Kuwait</source>
-        <translation  >科威特</translation>
-    </message>
-    <message>
-        <source>Kyrgystan</source>
-        <translation  >Kyrgystan</translation>
+        <translation>科威特</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation  >未知</translation>
+        <translation>未知</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation  >刪除</translation>
+        <translation>刪除</translation>
+    </message>
+    <message>
+        <source>Press to enter last- middle and firstname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The jobtitle..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Something like &quot;jr.&quot;..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The working place of the contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press to select attribute to change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press to select how to store the name (and howto show it in the listview)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Afghanistan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antarctica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Armenia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bolivia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cameroon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ghana</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guadeloupe</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guinea-Bissau</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jamaica</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kiribati</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Kyrgyzstan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Palestinian Sovereign Areas</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pitcairn Islands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Vietnam</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation  >公司電話號碼</translation>
+        <translation>公司電話號碼</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation  >公司傳真號碼</translation>
+        <translation>公司傳真號碼</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation  >公司手機號碼</translation>
+        <translation>公司手機號碼</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation  >預設電郵地址</translation>
+        <translation>預設電郵地址</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation  >電子郵件</translation>
+        <translation>電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation  >住家電話號碼</translation>
+        <translation>住家電話號碼</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation  >住家傳真號碼</translation>
+        <translation>住家傳真號碼</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation  >私人手機號碼</translation>
+        <translation>私人手機號碼</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation  >公司</translation>
+        <translation>公司</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation  >職業</translation>
+        <translation>職業</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation  >助理</translation>
+        <translation>助理</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation  >經理</translation>
+        <translation>經理</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation  >配偶</translation>
+        <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation  >性別</translation>
+        <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation  >生日</translation>
+        <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation  >週年紀念日</translation>
+        <translation>週年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation  >綽號</translation>
+        <translation>綽號</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation  >子女</translation>
+        <translation>子女</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation  >名稱</translation>
+        <translation>名稱</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation  >名</translation>
+        <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation  >中名</translation>
+        <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation  >姓</translation>
+        <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation  >Suffix</translation>
+        <translation>Suffix</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation  >歸檔為</translation>
+        <translation>歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation  >職稱</translation>
+        <translation>職稱</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation  >部門</translation>
+        <translation>部門</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation  >公司</translation>
+        <translation>公司</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation  >公司所在街道名稱</translation>
+        <translation>公司所在街道名稱</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation  >公司所在城市名稱</translation>
+        <translation>公司所在城市名稱</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation  >公司所在州名</translation>
+        <translation>公司所在州名</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation  >公司郵遞區號</translation>
+        <translation>公司郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation  >公司所在國家名稱</translation>
+        <translation>公司所在國家名稱</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation  >公司呼叫器號碼</translation>
+        <translation>公司呼叫器號碼</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation  >公司網頁</translation>
+        <translation>公司網頁</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation  >住家所在街道名稱</translation>
+        <translation>住家所在街道名稱</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation  >住家所在城市名稱</translation>
+        <translation>住家所在城市名稱</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation  >住家所在州名</translation>
+        <translation>住家所在州名</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation  >住家郵遞區號</translation>
+        <translation>住家郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation  >住家所在國家名稱</translation>
+        <translation>住家所在國家名稱</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation  >個人網頁</translation>
+        <translation>個人網頁</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation  >備註</translation>
-    </message>
-    <message>
-        <source>Groups</source>
-        <translation  >群組</translation>
+        <translation>備註</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 63f6d5d..46b51d2 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -1,292 +1,354 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
         <translation>進階檔案管理程式</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>View</source>
         <translation>檢視</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>顯示隱藏的檔案</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>建立目錄</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>重新命名</translation>
     </message>
     <message>
         <source>Run Command</source>
         <translation>執行指令</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>執行指令並輸出</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>切換至本地端</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>切換至遠端</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>無法重新命名</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>該目錄不存在</translation>
     </message>
     <message>
         <source>Copy As</source>
         <translation>複製為</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>進階檔案管理程式輸出</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>進階檔案管理程式紅外線輸出</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>紅外線傳送.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>改變目錄</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>開啟為文字檔</translation>
     </message>
     <message>
         <source>Make Symlink</source>
         <translation>建立 Symlink</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Move</source>
         <translation>移動</translation>
     </message>
     <message>
         <source>File Info</source>
         <translation>檔案資訊</translation>
     </message>
     <message>
         <source>Set Permissions</source>
         <translation>設定權限</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>傳輸檔案</translation>
     </message>
     <message>
         <source>Copy </source>
-        <translation>複製 </translation>
+        <translation type="unfinished">複製 </translation>
     </message>
     <message>
         <source> As</source>
-        <translation> 為</translation>
+        <translation type="unfinished"> 為</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>複製相同的目錄</translation>
     </message>
     <message>
         <source>Could not copy
 </source>
         <translation>無法複製</translation>
     </message>
     <message>
         <source>to
 </source>
         <translation>至</translation>
     </message>
     <message>
         <source>Could not move
 </source>
         <translation>無法移動</translation>
     </message>
     <message>
-        <source>Advanced FileManager
-is copyright 2002 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation>進階型檔案管理程式
- 版權 2002 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-,授權為 GPL</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>新增至文件</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
         <source>Really delete
 %1 files?</source>
         <translation>確定要刪除
 %1 個檔案?</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>刪除目錄?</translation>
     </message>
     <message>
-        <source>Really delete
-</source>
-        <translation>確定刪除</translation>
-    </message>
-    <message>
-        <source>Delete Directory</source>
-        <translation>刪除目錄</translation>
-    </message>
-    <message>
         <source>Really copy
 %1 files?</source>
         <translation>確定要複製
 %1 個檔案?</translation>
     </message>
     <message>
         <source>File Exists!</source>
         <translation>檔案已存在!</translation>
     </message>
     <message>
         <source>
 exists. Ok to overwrite?</source>
         <translation> 已存在. 要覆蓋嗎?</translation>
     </message>
     <message>
         <source> already exists.
 Do you really want to delete it?</source>
         <translation> 已經存在.
 您確定要刪除它?</translation>
     </message>
+    <message>
+        <source>Advanced FileManager
+is copyright 2002-2003 by
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+and is licensed by the GPL</source>
+        <translation type="unfinished">進階型檔案管理程式
+ 版權 2002-2003 
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+,授權為 GPL</translation>
+    </message>
+    <message>
+        <source>Cannot remove current directory
+from bookmarks.
+It is not bookmarked!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Current Directory from Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 exists. Ok to overwrite?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not copy %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete %1
+and all it&apos;s contents ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Really delete
+%1?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>將輸出存為檔案(只有名稱)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
+    <message>
+        <source>Process could not start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+Finished
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定這個檔案的權限:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>所有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>所有者</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>read</source>
         <translation>讀</translation>
     </message>
     <message>
         <source>write</source>
         <translation>寫</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>執行</translation>
     </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error- no  group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting ownership or group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error setting mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index c9a7e3c..74770fa 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -1,281 +1,285 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Appearance</name>
     <message>
         <source>Settings...</source>
         <translation>設定...</translation>
     </message>
     <message>
         <source>Current scheme</source>
         <translation>目前的主題</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>編輯...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
         <source>Force styling for all applications.</source>
         <translation>強制將樣式套用到所有的應用程式.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
         <translation>停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
         <translation>二元檔</translation>
     </message>
     <message>
         <source>Tab style:</source>
         <translation>標籤頁樣式:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>索引標籤</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>直式索引標籤</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>有圖示的直式索引標籤</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>頂端</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>底部</translation>
     </message>
     <message>
-        <source>Appearance</source>
-        <translation>外觀</translation>
-    </message>
-    <message>
         <source>Style</source>
         <translation>樣式</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>視窗</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Restart</source>
         <translation>重新啟動</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
         <translation>您現在想要重新啟動 %1 ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>主題已經存在.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>刪除主題</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>無法刪除目前的主題.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;新增&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>樣式控制了按鈕, 捲動軸等項目在所有應用程式中的顯示方式.
 
 請按這裡以選擇可以使用的樣式.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>請按這裡以設定目前選擇的樣式.
 
 注意: 並非所有的樣式都有這個選項.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>視窗裝飾控制了應用程式的標題列與其按鈕的顯示方式.
 
 請按這裡以選擇可以使用的裝飾.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>選擇想要的名稱, 樣式和應用程式所使用的預設字型大小.</translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
 Click here to select an available scheme.</source>
         <translation>色彩主題是用在顯示時各個部份的顏色的集合.
 
 請按這裡以選擇可以使用的主題.</translation>
     </message>
     <message>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>按這裡以改變目前的色彩主題中的顏色.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>按這裡以刪除在左方清單中所選擇的色彩主題.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>按這裡以命名並儲存目前的色彩主題.</translation>
     </message>
     <message>
         <source>Click here to allow all applications to use global appearance settings.</source>
         <translation>按這裡讓所有的應用程式使用全域外觀設定值.</translation>
     </message>
     <message>
         <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
 
 This area allows you to select an application and which settings you wish to disable.</source>
         <translation>如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
 
 這個區域允許您選擇要那些程式停用設定值.</translation>
     </message>
     <message>
         <source>Click here to add an application to the list above.</source>
         <translation>按這裡來將應用程式加入上面的清單.</translation>
     </message>
     <message>
         <source>Click here to delete the currently selected application.</source>
         <translation>按這裡以刪除目前選擇的應用程式.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application up in the list.</source>
         <translation>按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
     </message>
     <message>
         <source>Click here to move the currently selected application down in the list.</source>
         <translation>按這裡讓目前選擇的應用程式在清單中向下移動.</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>按這裡以選擇想要的索引標籤對話盒(本應用程式屬之)樣式. 可用的樣式有:
 
 1. 索引標籤 - 普通, 只有文字標籤的索引標籤
 2. 有圖示的索引標籤 - 每個索引標籤都有圖示, 文字標籤只出現在目前的索引標籤
 3. 直式索引標籤 - 垂直排列的索引標籤
 4. 有圖示的直式索引標籤 - 垂直排列且有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的頂端.</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>按這裡讓索引標籤出現在視窗的底部.</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>這是一個預覽視窗. 在這裡可以看到在改變選項之後的新外觀.</translation>
     </message>
+    <message>
+        <source>Rotation direction:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Appearance Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>編輯主題</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>按這裡來選擇顏色: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>範例</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>一般項目</translation>
     </message>
     <message>
         <source>Disabled Item</source>
         <translation>停用的項目</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
     <message>
         <source>Normal Text</source>
         <translation>一般文字</translation>
     </message>
     <message>
         <source>Highlighted Text</source>
         <translation>突顯的文字</translation>
     </message>
     <message>
         <source>Button</source>
         <translation>按鈕</translation>
     </message>
     <message>
         <source>Check Box</source>
         <translation>核取方塊</translation>
     </message>
     <message>
         <source>Sample window using the selected settings.</source>
         <translation>範例視窗使用選擇的設定值.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/aqpkg.ts b/i18n/zh_TW/aqpkg.ts
index 83eec9e..692fd63 100644
--- a/i18n/zh_TW/aqpkg.ts
+++ b/i18n/zh_TW/aqpkg.ts
@@ -1,506 +1,666 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>CategoryFilterDlg</name>
+    <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;OK</source>
-        <translation>&amp;O確定</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;C取消</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation>選擇顯示群組</translation>
+        <source>Select one or more groups</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>正在讀取設定...</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;O確定</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;C取消</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
+    <name>InstallDlgImpl</name>
     <message>
-        <source>Install</source>
-        <translation>安裝</translation>
+        <source>Close</source>
+        <translation>關閉</translation>
     </message>
     <message>
-        <source>Start</source>
-        <translation>開始</translation>
+        <source>Remove
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation>選項</translation>
+        <source>Install
+</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Output</source>
-        <translation>輸出</translation>
+        <source>Upgrade
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(ReInstall)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Upgrade)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation>目的檔</translation>
+        <translation type="unfinished">目的檔</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation>可使用空間</translation>
+        <translation type="unfinished">可使用空間</translation>
     </message>
-</context>
-<context>
-    <name>InstallDlgImpl</name>
     <message>
-        <source>Close</source>
-        <translation>關閉</translation>
+        <source>Output</source>
+        <translation type="unfinished">輸出</translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">開始</translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished">選項</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+**** User Clicked ABORT ***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>**** Process Aborted ****</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save output</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Kb</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
+    <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation>選項</translation>
+        <translation type="unfinished">選項</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation>Force Depends</translation>
+        <translation type="unfinished">Force Depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation>Force Reinstall</translation>
+        <translation type="unfinished">Force Reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation>Force Remove</translation>
+        <translation type="unfinished">Force Remove</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation>Force Overwrite</translation>
+        <translation type="unfinished">Force Overwrite</translation>
     </message>
     <message>
-        <source>Verbose WGet</source>
-        <translation>Verbose WGet</translation>
+        <source>Information Level</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OK</source>
-        <translation>確定</translation>
+        <source>Errors only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Informative messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Troubleshooting output</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Ipkg</name>
+    <message>
+        <source>Dealing with package %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing symbolic links...
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating symbolic links for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing status entry...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>package - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t open status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t create tempory status file - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Couldn&apos;t start ipkg process</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open :</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Creating directory </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Linked %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to link %1 to %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removed </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg - 套件管理者</translation>
     </message>
     <message>
         <source>Type the text to search for here.</source>
         <translation>在這裡輸入搜尋文字.</translation>
     </message>
     <message>
         <source>Click here to hide the Quick Jump toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update lists</source>
         <translation>更新  List</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upgrade</source>
         <translation>Upgrade</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <source>Click here to download the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apply changes</source>
         <translation>執行變更</translation>
     </message>
     <message>
         <source>Click here to install, remove or upgrade currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Show packages not installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show updated packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to show packages currently installed on this device which have a newer version available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filter by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to list packages belonging to one category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set filter category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to change package category to used filter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Click here to search for text in package names.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find next</source>
         <translation>尋找下一個</translation>
     </message>
     <message>
         <source>Click here to find the next package name containing the text you are searching for.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quick Jump keypad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation>瀏覽</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation>幫助</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>選項</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>伺服器:</translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Packages</source>
         <translation>套件</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
 
 A blue dot next to the package name indicates that the package is currently installed.
 
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="unfinished">關於 AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation>不</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>Download to where</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter path to download to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install Remote Package</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter package location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nothing to do</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No packages selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Do you wish to remove or reinstall
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>刪除或重新安裝</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>重新安裝</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>U</source>
+        <source>Updating Launcher...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsBase</name>
+    <name>PackageWindow</name>
     <message>
-        <source>Configuration</source>
-        <translation>設定</translation>
+        <source>&lt;b&gt;Description&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Servers</source>
+        <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Active Server</source>
+        <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name:</source>
+        <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>Package information is unavailable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change</source>
+        <source>Close</source>
+        <translation type="unfinished">關閉</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Installed packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>N/A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package - %1
+              version - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+              inst version - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Version string is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Epoch in version is not number.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nothing after colon in version number.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
-        <translation>刪除</translation>
+        <translation type="unfinished">刪除</translation>
     </message>
+</context>
+<context>
+    <name>SettingsImpl</name>
     <message>
-        <source>New</source>
-        <translation>新的</translation>
+        <source>Configuration</source>
+        <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <source>Destinations</source>
+        <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link To Root</source>
+        <source>Destinations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Proxy</source>
+        <source>New</source>
+        <translation type="unfinished">新的</translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password</source>
-        <translation>密碼</translation>
+        <source>Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled</source>
-        <translation>啟動</translation>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>FTP Proxy</source>
+        <source>Address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Active Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination</source>
+        <translation type="unfinished">目的檔</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username</source>
+        <source>HTTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Apply</source>
-        <translation type="unfinished">&amp;A執行</translation>
+        <source>Enabled</source>
+        <translation type="unfinished">啟動</translation>
     </message>
     <message>
-        <source>General</source>
+        <source>FTP Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Will take effect on restart)</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Jump To Letters</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/backgammon.ts b/i18n/zh_TW/backgammon.ts
index 4eb9e18..5f9519d 100644
--- a/i18n/zh_TW/backgammon.ts
+++ b/i18n/zh_TW/backgammon.ts
@@ -1,2 +1,166 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>AI_Dialog</name>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Expose&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Protect&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Safe&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Empty&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Values</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bring the pieces out of the endzone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eliminate an opponents piece</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expose you own pieces.
+After such a move only one piece will remain in the slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Protect a single piece by
+putting another one in this slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to a slot already
+occupied by the player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move piece to an empty slot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press and hold the ? buttton
+next to a field for help</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BackGammon</name>
+    <message>
+        <source>Backgammon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Game</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Player</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AI</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rules</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>deleted theme %1?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Theme</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;no move&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
+        <comment>P means player</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index 5c899ac..e97fdf4 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,52 +1,116 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation >備份與還原...執行中...</translation>
+        <translation>備份與還原...執行中...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
-        <translation >備份與還原</translation>
+        <translation>備份與還原</translation>
+    </message>
+    <message>
+        <source>Error from System:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup and Restore.. Failed !!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backup Successfull.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select something to restore.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open File: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Successfull.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation >備份與還原</translation>
+        <translation>備份與還原</translation>
     </message>
     <message>
         <source>Backup</source>
-        <translation >備份</translation>
+        <translation>備份</translation>
     </message>
     <message>
         <source>Applications</source>
-        <translation >應用程式</translation>
+        <translation>應用程式</translation>
     </message>
     <message>
         <source>Save To</source>
-        <translation >儲存至</translation>
+        <translation>儲存至</translation>
     </message>
     <message>
         <source>&amp;Backup</source>
-        <translation >&amp; 備份</translation>
+        <translation>&amp; 備份</translation>
     </message>
     <message>
         <source>Restore</source>
-        <translation >還原</translation>
+        <translation>還原</translation>
     </message>
     <message>
         <source>Select Source</source>
-        <translation >選擇來源</translation>
+        <translation>選擇來源</translation>
     </message>
     <message>
         <source>Column 1</source>
-        <translation >第一行</translation>
+        <translation>第一行</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
-        <translation >&amp;還原</translation>
+        <translation>&amp;還原</translation>
+    </message>
+    <message>
+        <source>Update Filelist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ErrorDialog</name>
+    <message>
+        <source>Error Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/bounce.ts b/i18n/zh_TW/bounce.ts
index 46d0b13..b046ab1 100644
--- a/i18n/zh_TW/bounce.ts
+++ b/i18n/zh_TW/bounce.ts
@@ -1,103 +1,119 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
         <translation>彈跳球</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>新遊戲(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Pause game</source>
         <translation>暫停遊戲(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>關於(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>遊戲(&amp;G)</translation>
     </message>
     <message>
         <source>Score: 00</source>
         <translation>分數: 00</translation>
     </message>
     <message>
         <source>Lives: 0%</source>
         <translation>生命: 0%</translation>
     </message>
     <message>
         <source>Filled: 00%</source>
         <translation>填滿: 00%</translation>
     </message>
     <message>
         <source>Time: 00</source>
         <translation>時間: 00</translation>
     </message>
     <message>
         <source>Bounce Level %1</source>
         <translation>彈跳球關卡 %1</translation>
     </message>
     <message>
         <source>Score: %1</source>
         <translation>分數: %1</translation>
     </message>
     <message>
         <source>Game paused.
 Press P to continue!</source>
         <translation>遊戲已暫停.
 請按 P 繼續!</translation>
     </message>
     <message>
         <source>Game Over!
 Score: %1</source>
         <translation>遊戲結束!
 分數: %1</translation>
     </message>
     <message>
         <source>Time: %1</source>
         <translation>時間: %1</translation>
     </message>
     <message>
         <source>Lives: %1</source>
         <translation>生命: %1</translation>
     </message>
     <message>
         <source>Filled: %1%</source>
         <translation>填滿: %1%</translation>
     </message>
     <message>
         <source>Filled: 0%</source>
         <translation>填滿: 0%</translation>
     </message>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
         <translation>成功地清除超過 75%.</translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
         <translation>%1 分: 每個生命得 15 分</translation>
     </message>
     <message>
         <source>%1 points: Bonus
 </source>
         <translation>%1 分: 紅利</translation>
     </message>
     <message>
         <source>%1 points: Total score
 </source>
         <translation>%1 分: 總分</translation>
     </message>
     <message>
         <source>On to level %1.
 You get %2 lives this time!</source>
         <translation>進入關卡 %1.
 您這次有 %2 個生命!</translation>
     </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written by: Stefan Schimanski
+Ported by: Martin Imobersteg
+
+Click to form walls.
+Hit space to switch wall direction.
+Try to reduce total space by 75%.
+
+This program is distributed under
+the terms of the GPL v2.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/buzzword.ts b/i18n/zh_TW/buzzword.ts
index 4d1bc18..a71309b 100644
--- a/i18n/zh_TW/buzzword.ts
+++ b/i18n/zh_TW/buzzword.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
-        <translation >buZzword</translation>
+        <translation>buZzword</translation>
     </message>
     <message>
         <source>&amp;New game</source>
         <translation>&amp;新遊戲</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation >&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index 77b4422..b726534 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/citytime.ts b/i18n/zh_TW/citytime.ts
index a15a229..cbf5722 100644
--- a/i18n/zh_TW/citytime.ts
+++ b/i18n/zh_TW/citytime.ts
@@ -1,67 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CityTime</name>
     <message>
         <source>Time Changing</source>
-        <translation >改變時間中</translation>
+        <translation>改變時間中</translation>
     </message>
     <message>
         <source>There was a problem setting timezone %1</source>
-        <translation >無法設定時區</translation>
+        <translation>無法設定時區</translation>
     </message>
     <message>
         <source>Restore Time Zone</source>
-        <translation >還原時區</translation>
+        <translation>還原時區</translation>
     </message>
     <message>
         <source>There was a problem setting your timezone.Your time may be wrong now...</source>
-        <translation >無法設定時區. 您的時間可能有誤.</translation>
+        <translation>無法設定時區. 您的時間可能有誤.</translation>
     </message>
 </context>
 <context>
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
-        <translation >城市之時間</translation>
+        <translation>城市之時間</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
-        <translation >點選已設定的城市來取代</translation>
+        <translation>點選已設定的城市來取代</translation>
     </message>
 </context>
 <context>
     <name>ZoneMap</name>
     <message>
         <source>CITY</source>
-        <translation >城市</translation>
+        <translation>城市</translation>
     </message>
     <message>
         <source>Unable to Find Timezone Info</source>
-        <translation >無法找到時區的資訊</translation>
+        <translation>無法找到時區的資訊</translation>
     </message>
     <message>
         <source>&lt;p&gt;Unable to find any timezone information in %1</source>
-        <translation >&lt;p&gt; 在%1中無法找到時區的資訊</translation>
+        <translation>&lt;p&gt; 在%1中無法找到時區的資訊</translation>
     </message>
     <message>
         <source>Couldn&apos;t Find Map</source>
-        <translation >無法找到地圖</translation>
+        <translation>無法找到地圖</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t load map: %1, exiting</source>
-        <translation >無法讀取地圖,退出中</translation>
+        <translation>無法讀取地圖,退出中</translation>
     </message>
     <message>
         <source>Continent</source>
-        <translation >洲</translation>
+        <translation>洲</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
-        <translation >在此選取洲/國家,然後選取城市</translation>
+        <translation>在此選取洲/國家,然後選取城市</translation>
     </message>
     <message>
         <source>City</source>
-        <translation >城市</translation>
+        <translation>城市</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/clock.ts b/i18n/zh_TW/clock.ts
index fe2aea3..78fb78f 100644
--- a/i18n/zh_TW/clock.ts
+++ b/i18n/zh_TW/clock.ts
@@ -1,94 +1,98 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>打盹</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>時鐘</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>碼表</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>設定鬧鐘</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
         <translation>鬧鐘已開啟</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
         <translation>鬧鐘已關閉</translation>
     </message>
     <message>
         <source>Set date and time.</source>
         <translation type="unfinished">設定時間與日期</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
         <translation>Clock: Alarm was missed.</translation>
     </message>
+    <message>
+        <source>Alarm set: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>設定鬧鐘</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>小時</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>分鐘</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Snooze Delay(new line)
 (minutes)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
         <translation>mp3 alarm</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index d1d5ee8..a18db60 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -1,744 +1,799 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>觀看</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>今天</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Day</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Week</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>Weeklst</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月份</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
-        <source>Alarm and Start Time...</source>
-        <translation>鬧鐘與開始時間...</translation>
-    </message>
-    <message>
-        <source>Default View</source>
-        <translation>預設瀏覽方式</translation>
-    </message>
-    <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Event duration is potentially longer
 than interval between repeats.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>不能編輯資料，正在同步中</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>編輯事件</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>分鐘)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>尚未儲存你的設定.
  請清空一點空間再試一次....
 Quit anyway?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(未知的)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>錯誤!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>修正他</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>繼續</translation>
     </message>
+    <message>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate Event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error box</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>天</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 下午</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 上午</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>下午</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>上午</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">行事曆</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>喜好選項</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">分鐘</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Row style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation>大</translation>
     </message>
     <message>
-        <source>Jump to current time (dayview)</source>
+        <source>Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default view:</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>Week List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump to current time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start</source>
+        <translation type="unfinished">開始</translation>
+    </message>
+    <message>
+        <source>Start-End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">公司</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">家</translation>
+    </message>
+    <message>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekHeaderBase</name>
-    <message>
-        <source>Y: </source>
-        <translation>Y:</translation>
-    </message>
+    <name>DateBookWeekHeader</name>
     <message>
-        <source>W: </source>
-        <translation>W:</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. 一月-00. 一月</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>W: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00. 一月-00. 一月</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
-        <translation>一</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Tuesday</comment>
-        <translation>二</translation>
-    </message>
-    <message>
-        <source>W</source>
-        <comment>Wednesday</comment>
-        <translation>三</translation>
-    </message>
-    <message>
-        <source>T</source>
-        <comment>Thursday</comment>
-        <translation>四</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation>五</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation>六</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation>日</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>重覆...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>每日...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>每星期...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>每月...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>每年...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Start Time</source>
         <translation>開始時間</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>結束時間</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>新事件</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>地點</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>分類</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>約會</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>中餐</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>晚餐</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>旅行</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>家</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>開始時間</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>終日</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>時區</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;A鬧鐘</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>分鐘</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>沉默</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>大聲</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>序述</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>編輯備忘錄</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>每 %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>每%1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>每%1 %1</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>每</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>星期一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>星期二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>星期三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>星期四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>星期五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>星期六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>星期天</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>不重覆</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>日(s)</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>星期(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>月(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>年(s)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>日</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source> and </source>
         <translation>和</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>, 和</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, 和</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>重覆事件</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>星期</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>每:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>頻率</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>結束:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>無結束日期</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation>月</translation>
     </message>
     <message>
         <source>years</source>
         <translation>年</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/drawpad.ts b/i18n/zh_TW/drawpad.ts
index 70557a9..588e80d 100644
--- a/i18n/zh_TW/drawpad.ts
+++ b/i18n/zh_TW/drawpad.ts
@@ -1,349 +1,445 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>刪除全部</translation>
     </message>
     <message>
         <source>Import</source>
         <translation>Import</translation>
     </message>
     <message>
         <source>Import...</source>
         <translation>Import...</translation>
     </message>
     <message>
         <source>Export</source>
         <translation>Export</translation>
     </message>
     <message>
         <source>Export...</source>
         <translation>Export</translation>
     </message>
     <message>
         <source>Tools</source>
         <translation>工具列</translation>
     </message>
     <message>
         <source>New Page</source>
         <translation>新分頁</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>清除分頁</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>刪除分頁</translation>
     </message>
     <message>
         <source>Undo</source>
         <translation>回復</translation>
     </message>
     <message>
         <source>Redo</source>
         <translation>重做</translation>
     </message>
     <message>
         <source>First Page</source>
         <translation>第一頁</translation>
     </message>
     <message>
         <source>Previous Page</source>
         <translation>前一頁</translation>
     </message>
     <message>
         <source>Next Page</source>
         <translation>下一頁</translation>
     </message>
     <message>
         <source>Last Page</source>
         <translation>最後一頁</translation>
     </message>
     <message>
         <source>Draw Point</source>
         <translation>點</translation>
     </message>
     <message>
         <source>Draw Line</source>
         <translation>線</translation>
     </message>
     <message>
         <source>Draw Rectangle</source>
         <translation>三角形</translation>
     </message>
     <message>
         <source>Draw Filled Rectangle</source>
         <translation>填滿的三角形</translation>
     </message>
     <message>
         <source>Draw Ellipse</source>
         <translation>橢圓形</translation>
     </message>
     <message>
         <source>Draw Filled Ellipse</source>
         <translation>填滿的橢圓形</translation>
     </message>
     <message>
         <source>Fill Region</source>
         <translation>填滿某區間</translation>
     </message>
     <message>
         <source>Erase Point</source>
         <translation>清除點</translation>
     </message>
     <message>
         <source>Pen Width</source>
         <translation>畫筆寬度</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>畫筆顏色</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>填滿顏色</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>DrawPad</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>頁</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>插入文字</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>投影片</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
         <translation>投影片...</translation>
     </message>
     <message>
         <source>Page Information</source>
         <translation>分頁資訊</translation>
     </message>
     <message>
         <source>Page Information...</source>
         <translation>分頁資訊...</translation>
     </message>
     <message>
         <source>Do you want to clear
 the current page?</source>
         <translation>你想要清除
 此分頁嗎?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Do you want to delete
 the current page?</source>
         <translation>你想要刪出此分頁嗎?</translation>
     </message>
     <message>
         <source>Do you want to delete
 all the pages?</source>
         <translation>你想要刪除
 全部的分頁嗎?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-Aliasing</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>選擇分頁</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Current</source>
         <translation>現在</translation>
     </message>
     <message>
         <source>Range</source>
         <translation>範圍</translation>
     </message>
     <message>
         <source>To:</source>
         <translation>To:</translation>
     </message>
     <message>
         <source>Export As</source>
         <translation>Export As</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
         <source>Format:</source>
         <translation>格式:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>小畫家 - Export</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>自動預覽</translation>
     </message>
     <message>
         <source>Preview</source>
         <translation>預覽</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>小畫家 - Import</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>新分頁</translation>
     </message>
     <message>
         <source>White</source>
         <translation>白</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>背景</translation>
     </message>
     <message>
         <source>Pen Color</source>
         <translation>畫筆顏色</translation>
     </message>
     <message>
         <source>Fill Color</source>
         <translation>填充顏色</translation>
     </message>
     <message>
         <source>General</source>
         <translation>一般的</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>抬頭:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>尺寸</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>寬:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>高:</translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
         <translation>分頁資訊</translation>
     </message>
     <message>
         <source>General</source>
         <translation>一般的</translation>
     </message>
     <message>
         <source>Title:</source>
         <translation>抬頭:</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>日期:</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>尺寸</translation>
     </message>
     <message>
         <source>Width:</source>
         <translation>寬:</translation>
     </message>
     <message>
         <source>Height:</source>
         <translation>高:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>抬頭:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>維度:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>日期:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>插入文字</translation>
     </message>
 </context>
 <context>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
         <translation>小畫家 - 投影片</translation>
     </message>
     <message>
         <source>Clear Page</source>
         <translation>清除分頁</translation>
     </message>
     <message>
         <source>Do you want to clear
 the selected page?</source>
         <translation>確定刪除所選分頁?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是的</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Delete Page</source>
         <translation>刪除分頁</translation>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>確定刪除所選分頁?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/euroconv.ts b/i18n/zh_TW/euroconv.ts
index 4eb9e18..3b1456a 100644
--- a/i18n/zh_TW/euroconv.ts
+++ b/i18n/zh_TW/euroconv.ts
@@ -1,2 +1,9 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Euroconv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/formatter.ts b/i18n/zh_TW/formatter.ts
index 03a9423..a5ae168 100644
--- a/i18n/zh_TW/formatter.ts
+++ b/i18n/zh_TW/formatter.ts
@@ -1,172 +1,212 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>FormatterApp</name>
     <message>
         <source>Formatter</source>
         <translation>格式化工具</translation>
     </message>
     <message>
         <source>Storage Type</source>
         <translation>儲存類型</translation>
     </message>
     <message>
         <source>File Systems</source>
         <translation>檔案系統</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>格式</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
         <source>CAUTION:
 Changing parameters on this 
 page may cause your system 
 to stop functioning properly!!</source>
-        <translation>警告:
+        <translation type="obsolete">警告:
 改變這一頁的參數
 可能造成您的系統
 停止正常功能!!</translation>
     </message>
     <message>
         <source>Edit fstab</source>
         <translation>編輯 fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>檢查磁碟</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>掛載點</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Format?!?</source>
-        <translation>格式化?!?</translation>
+        <translation type="obsolete">格式化?!?</translation>
     </message>
     <message>
         <source>Really format
 </source>
         <translation>確定要格式化</translation>
     </message>
     <message>
         <source>
 with </source>
-        <translation>
+        <translation type="obsolete">
 為 </translation>
     </message>
     <message>
         <source> filesystem?!?
 You will loose all data!!</source>
-        <translation> 檔案系統?!?
+        <translation type="obsolete"> 檔案系統?!?
 您將會失去所有的資料!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>無法格式化.
 未知的類型</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Formatter Output</source>
         <translation>格式化工具輸出</translation>
     </message>
     <message>
         <source>Trying to umount.</source>
         <translation>正在嘗試卸載.</translation>
     </message>
     <message>
         <source>umount failed!</source>
         <translation>卸載失敗!</translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation>確定(&amp;O)</translation>
     </message>
     <message>
         <source>Could not umount.
 Device is busy!</source>
         <translation>無法卸載.
 裝置忙碌中!</translation>
     </message>
     <message>
         <source>Trying to format.</source>
         <translation>正在嘗試格式化.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>沒有這個裝置!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 已經成功地格式化.</translation>
     </message>
     <message>
         <source>Trying to mount.</source>
-        <translation>正在嘗試掛載.</translation>
+        <translation type="obsolete">正在嘗試掛載.</translation>
     </message>
     <message>
         <source>Card mount failed!</source>
         <translation>掛載記憶卡失敗!</translation>
     </message>
     <message>
         <source>
 has been successfully mounted.</source>
-        <translation>
+        <translation type="obsolete">
 已經成功地掛載.</translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
         <translation>您現在可以關閉輸出視窗.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>內部的</translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation>儲存類型 : </translation>
+        <translation type="obsolete">儲存類型 : </translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>總計: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>已使用: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>還剩: %1 kB ( %d mB)</translation>
     </message>
+    <message>
+        <source>CAUTION:
+Changing parameters on this
+page may cause your system
+to stop functioning properly!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+with %1 filesystem?
+You will loose all data!!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to umount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Trying to mount %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1
+has been successfully mounted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Storage Type: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: %1
+Formatted with %2
+%3, %4, %5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/helpbrowser.ts b/i18n/zh_TW/helpbrowser.ts
index d3f398f..961e188 100644
--- a/i18n/zh_TW/helpbrowser.ts
+++ b/i18n/zh_TW/helpbrowser.ts
@@ -1,37 +1,37 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
-        <translation >往回</translation>
+        <translation>往回</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation >往前</translation>
+        <translation>往前</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation >家目錄</translation>
+        <translation>家目錄</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation >新增書簽</translation>
+        <translation>新增書簽</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
-        <translation >從書簽中移除</translation>
+        <translation>從書簽中移除</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation >書簽</translation>
+        <translation>書簽</translation>
     </message>
     <message>
         <source>Help Browser</source>
-        <translation >幫助瀏覽器</translation>
+        <translation>幫助瀏覽器</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation >幫助瀏覽器</translation>
+        <source>Go</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kbill.ts b/i18n/zh_TW/kbill.ts
index f52df73..f06547d 100644
--- a/i18n/zh_TW/kbill.ts
+++ b/i18n/zh_TW/kbill.ts
@@ -1,71 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>HelpDialog</name>
-    <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-</context>
-<context>
     <name>KBill</name>
     <message>
         <source>kBill</source>
         <translation>K比爾</translation>
     </message>
     <message>
         <source>New game</source>
         <translation>新遊戲</translation>
     </message>
     <message>
         <source>Pause game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
         <source>Story of kBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>Rules</source>
         <translation>規則</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
         <translation>&lt;b&gt;故事&lt;/b&gt;這個世界的命運又再度掌握在你的手裡! 有一個邪惡的電腦駭客, 只知道他的代號是 &apos;Bill&apos;, 已經製造了一種終極的電腦病毒. 這個病毒的威力十分強大, 甚至可以把一般的電腦變成一臺烤麵包機. (噢!) &apos;Bill&apos; 已經把自己複製成多得數不清的微型比爾. 他們唯一的目的就是要散佈這個凶惡的病毒, 而它已經被巧妙地偽裝成一個非常熱門的作業系統. 身為系統管理者與病毒剋星, 你的工作是阻止比爾完成他的野心.</translation>
     </message>
     <message>
         <source>The story of KBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>K比爾的規則</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
-        <translation>&lt;b&gt;規則&lt;/b&lgt;K比爾經過辛勤的設計與研究使它變得很容易而適合全家人, 正如適合小 Sally 一樣. 日復一日的 beta 測試加上向廉價人工智慧設計師諮詢終於產生容易使用的遊戲, 不過一點也不像麥金塔.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;敲打比爾(點一下)&lt;/LI&gt;&lt;LI&gt;重新啟動電腦(點一下)&lt;/LI&gt;&lt;LI&gt;撿起被偷的作業系統 &amp; 把它們交還(拖放)給各自的電腦&lt;/LI&gt;&lt;LI&gt;拖拉水桶去澆熄火花&lt;/LI&gt;&lt;LI&gt;分數是以花費的時間計算, 殺掉比爾還有紅利.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;至於剩下的部份, 您應該可以靠自己解決. 我們做到了, 所以它應該不會太難.</translation>
+        <translation>&lt;b&gt;規則&lt;/bK比爾經過辛勤的設計與研究使它變得很容易而適合全家人, 正如適合小 Sally 一樣. 日復一日的 beta 測試加上向廉價人工智慧設計師諮詢終於產生容易使用的遊戲, 不過一點也不像麥金塔.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;敲打比爾(點一下)&lt;/LI&gt;&lt;LI&gt;重新啟動電腦(點一下)&lt;/LI&gt;&lt;LI&gt;撿起被偷的作業系統 &amp; 把它們交還(拖放)給各自的電腦&lt;/LI&gt;&lt;LI&gt;拖拉水桶去澆熄火花&lt;/LI&gt;&lt;LI&gt;分數是以花費的時間計算, 殺掉比爾還有紅利.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;至於剩下的部份, 您應該可以靠自己解決. 我們做到了, 所以它應該不會太難.</translation>
     </message>
 </context>
 <context>
     <name>UI</name>
     <message>
         <source>After Level</source>
         <translation>經過關卡</translation>
     </message>
     <message>
         <source>Your score</source>
         <translation>您的分數</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kpacman.ts b/i18n/zh_TW/kpacman.ts
index c90f372..fc7cdb7 100644
--- a/i18n/zh_TW/kpacman.ts
+++ b/i18n/zh_TW/kpacman.ts
@@ -1,250 +1,244 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Keys</name>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>預設值</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Change Direction Keys</source>
         <translation>改變方向鍵</translation>
     </message>
     <message>
         <source>Undefined key</source>
         <translation>未定義的按鍵</translation>
     </message>
 </context>
 <context>
     <name>Kpacman</name>
     <message>
         <source>&amp;New</source>
         <translation>新遊戲(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Pause</source>
         <translation>暫停(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Hall of fame</source>
         <translation>名人堂(&amp;H)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
         <translation>離開(&amp;Q)</translation>
     </message>
     <message>
         <source>&amp;Hide Mousecursor</source>
         <translation>隱藏滑鼠游標(&amp;H)</translation>
     </message>
     <message>
         <source>&amp;Select graphic scheme</source>
         <translation>選擇圖形主題(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Pause in Background</source>
         <translation>在背景時暫停(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Continue in Foreground</source>
         <translation>在前景時繼續(&amp;C)</translation>
     </message>
     <message>
         <source>Change &amp;keys...</source>
         <translation>改變按鍵(&amp;K)...</translation>
     </message>
     <message>
         <source>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 A pacman game for the KDE Desktop
 
 The program based on the source of ksnake
 by Michel Filippi (mfilippi@sade.rhein-main.de).
 The design was strongly influenced by the pacman
 (c) 1980 MIDWAY MFG.CO.
 
 I like to thank my girlfriend Elke Krueers for
 the last 10 years of her friendship.
 </source>
         <translation>@PACKAGE@ - @VERSION@
 
 Joerg Thoennissen (joe@dsite.de)
 
 KDE 桌面環境的小精靈遊戲
 
 這個遊戲的基礎是 Michel Filippi (mfilippi@sade.rhein-main.de)
 的 ksnake 的原始碼. 
 它的設計受到小精靈(c) 1980 MIDWAY MFG.CO的強烈影響.
 
 我想要感謝我的女友 Elke Krueers
 過去 10 年的友情.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation>組態錯誤</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation>沒有定義主題,
-或尚未選擇主題.</translation>
+        <source>KPacman</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>無法建立點陣字型.
 
 檔案 &apos;@FONTNAME@&apos; 不存在,
 或者它是未知的格式.</translation>
     </message>
 </context>
 <context>
     <name>Referee</name>
     <message>
         <source>GAME  OVER</source>
         <translation>遊戲結束</translation>
     </message>
     <message>
         <source>PLAYER ONE</source>
         <translation>一號玩家</translation>
     </message>
     <message>
         <source>READY!</source>
         <translation>預備!</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>CHARACTER</source>
         <translation>角色</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>NICKNAME</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>-SHADOW</source>
         <translation>-SHADOW</translation>
     </message>
     <message>
         <source>&quot;BLINKY&quot;</source>
         <translation>&quot;BLINKY&quot;</translation>
     </message>
     <message>
         <source>-SPEEDY</source>
         <translation>-SPEEDY</translation>
     </message>
     <message>
         <source>&quot;PINKY&quot;</source>
         <translation>&quot;PINKY&quot;</translation>
     </message>
     <message>
         <source>-BASHFUL</source>
         <translation>-BASHFUL</translation>
     </message>
     <message>
         <source>&quot;INKY&quot;</source>
         <translation>&quot;INKY&quot;</translation>
     </message>
     <message>
         <source>-POKEY</source>
         <translation>-POKEY</translation>
     </message>
     <message>
         <source>&quot;CLYDE&quot;</source>
         <translation>&quot;CLYDE&quot;</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>移植到 QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>按下游標以便開始</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> 最高分數 </translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     恭喜      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    你已經達到    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  前 10 名的分數.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   SCORE  NAME   DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>                          </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>無法建立點陣圖.
 
 檔案 &apos;@PIXMAPNAME@&apos; 不存在,
 或者它是未知的格式.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>初始化錯誤</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/language.ts b/i18n/zh_TW/language.ts
index a074308..2412cf4 100644
--- a/i18n/zh_TW/language.ts
+++ b/i18n/zh_TW/language.ts
@@ -1,24 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
         <translation>英文</translation>
     </message>
     <message>
         <source>default</source>
         <translation>預設值</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
-        <source>Language</source>
-        <translation>語言</translation>
-    </message>
-    <message>
         <source>Select language</source>
         <translation>選擇語言</translation>
     </message>
+    <message>
+        <source>Language Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/launchersettings.ts b/i18n/zh_TW/launchersettings.ts
index d6ee0ff..8cdb19d 100644
--- a/i18n/zh_TW/launchersettings.ts
+++ b/i18n/zh_TW/launchersettings.ts
@@ -1,208 +1,208 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SampleView</name>
+    <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ruled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solid color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/unmaintained/ja/libmpeg3plugin.ts b/i18n/zh_TW/lib.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ja/libmpeg3plugin.ts
+++ b/i18n/zh_TW/lib.ts
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index b13a11a..cbc1577 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -1,61 +1,85 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery Status</source>
-        <translation>電池狀態</translation>
-    </message>
-    <message>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>充電中</translation>
     </message>
     <message>
         <source>Percentage battery remaining</source>
         <translation>Percentage battery remaining</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>電池狀態:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>良好</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>非常低</translation>
     </message>
     <message>
         <source>Critical</source>
         <translation>臨界的</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>使用備份電源</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>使用電源線</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>外部電源切斷</translation>
     </message>
     <message>
         <source>Battery time remaining</source>
         <translation>Battery time remaining</translation>
     </message>
+    <message>
+        <source>Battery status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>could not open file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Charging both devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Percentage battery remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Battery time remaining: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No jacket with battery inserted</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 0b5ef8d..28c4368 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CardMonitor</name>
     <message>
         <source>CF/PCMCIA card eject failed!</source>
         <translation>CF/PCMCIA 移除失敗!</translation>
     </message>
     <message>
         <source>SD/MMC card eject failed!</source>
         <translation>SD/MMC 移除失敗!</translation>
     </message>
     <message>
         <source>New card: </source>
-        <translation >新卡片:</translation>
+        <translation>新卡片:</translation>
     </message>
     <message>
         <source>Ejected: </source>
         <translation>移除:</translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
         <translation>移除 SD/MMC card</translation>
     </message>
     <message>
         <source>Eject card 0: %1</source>
         <translation>移除 card 0: %1</translation>
     </message>
     <message>
         <source>Eject card 1: %1</source>
         <translation>移除 card 1: %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libclockapplet.ts b/i18n/zh_TW/libclockapplet.ts
index 4eb9e18..db92457 100644
--- a/i18n/zh_TW/libclockapplet.ts
+++ b/i18n/zh_TW/libclockapplet.ts
@@ -1,2 +1,5 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>LauncherClock</name>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libflatstyle.ts b/i18n/zh_TW/libflatstyle.ts
index 4eb9e18..25a952a 100644
--- a/i18n/zh_TW/libflatstyle.ts
+++ b/i18n/zh_TW/libflatstyle.ts
@@ -1,2 +1,10 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>FlatStyle</name>
+    <message>
+        <source>Flat</source>
+        <comment>Name of the style Flat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libhomeapplet.ts b/i18n/zh_TW/libhomeapplet.ts
index 1242dba..42a0349 100644
--- a/i18n/zh_TW/libhomeapplet.ts
+++ b/i18n/zh_TW/libhomeapplet.ts
@@ -1,13 +1,13 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation >快速進入家目錄</translation>
+        <translation>快速進入家目錄</translation>
     </message>
     <message>
-        <source>Home</source>
-        <translation>進入家目錄</translation>
+        <source>Desktop</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libinterfaces.ts b/i18n/zh_TW/libinterfaces.ts
index 407ea1f..8239ed9 100644
--- a/i18n/zh_TW/libinterfaces.ts
+++ b/i18n/zh_TW/libinterfaces.ts
@@ -1,154 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>eth0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Expires</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lease Obtained</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S&amp;top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;estart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Broadcast</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>0.0.0.0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>be &amp;silent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatically bring up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DHCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subnet Mask</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First DNS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Second DNS</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>255.255.255.0</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libirdaapplet.ts b/i18n/zh_TW/libirdaapplet.ts
index 410b079..89101a7 100644
--- a/i18n/zh_TW/libirdaapplet.ts
+++ b/i18n/zh_TW/libirdaapplet.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
-        <translation >找到的設備</translation>
+        <translation>找到的設備</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
-        <translation >關閉紅外線</translation>
+        <translation>關閉紅外線</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
-        <translation >啟動紅外線</translation>
+        <translation>啟動紅外線</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
-        <translation >關閉搜尋功能</translation>
+        <translation>關閉搜尋功能</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
-        <translation >啟動搜尋功能</translation>
+        <translation>啟動搜尋功能</translation>
     </message>
     <message>
         <source>Disable Receive</source>
-        <translation >關閉接收功能</translation>
+        <translation>關閉接收功能</translation>
     </message>
     <message>
         <source>Enable Receive</source>
-        <translation >啟動接收功能</translation>
+        <translation>啟動接收功能</translation>
     </message>
     <message>
         <source>Found:</source>
-        <translation >找到:</translation>
+        <translation>找到:</translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation >斷線:</translation>
+        <translation>斷線:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libkppp.ts b/i18n/zh_TW/libkppp.ts
new file mode 100644
index 0000000..b184b3f
--- a/dev/null
+++ b/i18n/zh_TW/libkppp.ts
@@ -0,0 +1,1263 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>AccountWidget</name>
+    <message>
+        <source>Allows you to modify the selected account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new dialup connection
+to the Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected account. All
+settings of the selected account are copied
+to a new account, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected account
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No account selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the account &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Account: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Login Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Authentication</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway Setup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute Programs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique account name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AuthWidget</name>
+    <message>
+        <source>Authentication: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal-based</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PAP/CHAP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the method used to identify yourself to
+the PPP server. Most universities still use
+&lt;b&gt;Terminal&lt;/b&gt;- or &lt;b&gt;Script&lt;/b&gt;-based authentication,
+while most ISP use &lt;b&gt;PAP&lt;/b&gt; and/or &lt;b&gt;CHAP&lt;/b&gt;. If
+unsure, contact your ISP.
+
+If you can choose between PAP and CHAP,
+choose CHAP, because it&apos;s much safer. If you don&apos;t know
+whether PAP or CHAP is right, choose PAP/CHAP.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your username here...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your password here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this is turned on, your ISP password
+will be saved in &lt;i&gt;kppp&lt;/i&gt;&apos;s config file, so
+you do not need to type it in every time.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Warning:&lt;/font&gt; your password will be stored as
+plain text in the config file, which is
+readable only to you. Make sure nobody
+gains access to this file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChooserWidget</name>
+    <message>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;New...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;py</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DNSWidget</name>
+    <message>
+        <source>Domain name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enter a domain name here, this domain
+name is used for your computer while you are
+connected. When the connection is closed, the
+original domain name of your computer is
+restored.
+
+If you leave this field blank, no changes are
+made to the domain name.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manual</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify a new DNS server to be
+used while you are connected. When the
+connection is closed, this DNS entry will be
+removed again.
+
+To add a DNS server, type in the IP address of
+the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to add the DNS server
+specified in the field above. The entry
+will then be added to the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click this button to remove the selected DNS
+server entry from the list below</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DNS address list:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;This shows all defined DNS servers to use
+while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
+&lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disable DNS servers during connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;When this option is selected, all DNS
+servers specified in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; are
+temporary disabled while the dialup connection
+is established. After the connection is
+closed, the servers will be re-enabled
+
+Typically, there is no reason to use this
+option, but it may become useful under 
+some circumstances.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DevicesWidget</name>
+    <message>
+        <source>No devices selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to delete
+the device &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to modify the selected device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create a new device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Makes a copy of the selected device. All
+settings of the selected device are copied
+to a new device, that you can modify to fit your
+needs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Deletes the selected device
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must enter a unique device name</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DialWidget</name>
+    <message>
+        <source>Connection name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type in a unique name for this connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies the phone numbers to dial. You
+can supply multiple numbers here, simply
+click on &quot;Add&quot;. You can arrange the
+order the numbers are tried by using the
+arrow buttons.
+
+When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
+try the next number and so on</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Customize pppd Arguments...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ExecWidget</name>
+    <message>
+        <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is established. It is called immediately before
+dialing has begun.
+
+This might be useful, e.g. to stop HylaFAX blocking the
+modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+is established. When your program is called, all
+preparations for an Internet connection are finished.
+
+Very useful for fetching mail and news</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Before disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
+is closed. The connection will stay open until
+the program exits.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upon disconnect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
+has been closed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GatewayWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This makes the PPP peer computer (the computer
+you are connected to with your modem) to act as
+a gateway. Your computer will send all packets not
+going to a computer inside your local net to this
+computer, which will route these packets.
+
+This is the default for most ISPs, so you should
+probably leave this option on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Allows you to specify which computer you want
+to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gateway IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assign the default route to this gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this option is enabled, all packets not
+going to the local net are routed through
+the PPP connection.
+
+Normally, you should turn this on</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IPWidget</name>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dynamic IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer gets an
+internet address (IP) every time a
+connection is made.
+
+Almost every Internet Service Provider uses
+this method, so this should be turned on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Static IP address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select this option when your computer has a
+fixed internet address (IP). Most computers
+don&apos;t have this, so you should probably select
+dynamic IP addressing unless you know what you
+are doing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP address:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If your computer has a permanent internet
+address, you must supply your IP address here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Subnet mask:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;If your computer has a static Internet address,
+you must supply a network mask here. In almost
+all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
+but your mileage may vary.
+
+If unsure, contact your Internet Service Provider</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-configure hostname from this IP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Whenever you connect, this reconfigures
+your hostname to match the IP address you
+got from the PPP server. This may be useful
+if you need to use a protocol which depends
+on this information, but it can also cause several
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
+
+Don&apos;t enable this unless you really need it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
+For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InterfacePPP</name>
+    <message>
+        <source>No password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username defined but no password
+ Please enter a password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemTransfer</name>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget</name>
+    <message>
+        <source>Modem &amp;name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem de&amp;vice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies the serial port your modem is attached 
+to. On Linux/x86, typically this is either /dev/ttyS0 
+(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).
+
+If you have an internal ISDN card with AT command
+emulation (most cards under Linux support this), you
+should select one of the /dev/ttyIx devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Flow control:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware [CRTSCTS]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Software [XON/XOFF]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how the serial port and modem
+communicate. You should not change this unless
+you know what you are doing.
+
+&lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Line termination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Specifies how AT commands are sent to your
+modem. Most modems will work fine with the
+default &lt;i&gt;CR/LF&lt;/i&gt;. If your modem does not react
+to the init string, you should try different
+settings here
+
+&lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Co&amp;nnection speed:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the speed your modem and the serial
+port talk to each other. You should begin with
+the default of 38400 bits/sec. If everything
+works you can try to increase this value, but to
+no more than 115200 bits/sec (unless you know
+that your serial port supports higher speeds).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Use lock file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;To prevent other programs from accessing the
+modem while a connection is established, a
+file can be created to indicate that the modem
+is in use. On Linux an example file would be
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Here you can select whether this locking will
+be done.
+
+&lt;b&gt;Default&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem timeout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
+&lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
+recommended value is 30 seconds.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ModemWidget2</name>
+    <message>
+        <source>Busy wait:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Wait for dial tone before dialing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Normally the modem waits for a dial tone
+from your phone line, indicating that it can
+start to dial a number. If your modem does not
+recognize this sound, or your local phone system
+does not emit such a tone, uncheck this option
+
+&lt;b&gt;Default:&lt;/b&gt;: On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specifies the number of seconds to wait before
+redial if all dialed numbers are busy. This is
+necessary because some modems get stuck if the
+same number is busy too often.
+
+The default is 0 seconds, you should not change
+this unless you need to.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem &amp;volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems have a speaker which makes
+a lot of noise when dialing. Here you can
+either turn this completely off or select a
+lower volume.
+
+If this does not work for your modem,
+you must modify the modem volume command.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem asserts CD line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
+is not responding. Unless you are having
+problems with this, do not modify this setting.
+
+&lt;b&gt;Default&lt;/b&gt;: Off</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mod&amp;em Commands...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allows you to change the AT command for
+your modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Query Modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Most modems support the ATI command set to
+find out vendor and revision of your modem.
+
+Press this button to query your modem for
+this information. It can be useful to help
+you setup the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPConfigWidget</name>
+    <message>
+        <source>Configure Modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A critical failure appeard while testing the modem</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PPPdArguments</name>
+    <message>
+        <source>Customize pppd Arguments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argument:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PhoneNumberDialog</name>
+    <message>
+        <source>Add Phone Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter a phone number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>PPP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>generic ppp device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open modem.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to detect state of CD line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is not ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem is busy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t restore tty settings: tcsetattr()
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The modem does not respond.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown speed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ATI Query</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create modem lock file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looking for modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query timed out.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem device is locked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Ready</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>One moment please...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Query Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You&apos;re not allowed to dial out with kppp.
+Contact your system administrator.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot find the PPP daemon!
+Make sure that pppd is installed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You do not have the permission to start pppd!
+Contact your system administrator and ask to get access to pppd.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You don&apos;t have sufficient permission to run
+%1
+Please make sure that kppp is owned by root and has the SUID bit set.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is missing or can&apos;t be read!
+Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Modem Commands</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pre-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initialization string %1:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Post-init delay (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing speed (sec/100):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Init response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone detection:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dial string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Busy response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No carrier response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No dial tone response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ring response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape string:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Escape response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Guard time (sec/50):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume off/low/high:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connected at:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time connected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Session Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Bill:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Byte</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Online</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Log</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connecting to: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running pre-startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Initializing modem...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting speaker volume...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turning off dial tone waiting...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dialing %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Hanging up...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Line busy. Waiting: %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Dialtone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Carrier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sending %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout %1 seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hangup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ID %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompting %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PW Prompt %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop Start %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ERROR: Nested too deep, ignored.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loops nested too deeply!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Loop End %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LoopEnd without matching Start! Line: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Starting pppd...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan Var: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Found: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Looping: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Script timed out!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scanning: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expecting: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Logging on to network...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Running startup command...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You must specify a telephone number!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ScriptWidget</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index c55907e..9b4dece 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,68 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Decoration</name>
+    <message>
+        <source>Liquid</source>
+        <translation type="obsolete">透明</translation>
+    </message>
+</context>
+<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>透明風格</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>不使用半透明</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>網底, 背景顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>網底, 按鈕顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>透明網底, 背景顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>透明網底, 按鈕顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>自訂半透明</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>選單顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>文字顏色</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>不透明度</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>使用有陰影的選單文字</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>讓工具列按鈕變得扁平</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>網底對比</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>透明</translation>
+        <translation type="unfinished">透明</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Mosfet 提供的高品質透明風格</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/liblogoutapplet.ts b/i18n/zh_TW/liblogoutapplet.ts
index 01d33f3..92b6e00 100644
--- a/i18n/zh_TW/liblogoutapplet.ts
+++ b/i18n/zh_TW/liblogoutapplet.ts
@@ -1,18 +1,18 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation >快速登出</translation>
+        <translation>快速登出</translation>
     </message>
     <message>
         <source>Logout</source>
-        <translation >登出</translation>
+        <translation>登出</translation>
     </message>
     <message>
         <source>Do you really want to
 end this session ?</source>
-        <translation >確定登出?</translation>
+        <translation>確定登出?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/unmaintained/ko/libclockapplet.ts b/i18n/zh_TW/libmodplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ko/libclockapplet.ts
+++ b/i18n/zh_TW/libmodplugin.ts
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 7cf93a1..493d2ea 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -1,112 +1,658 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>Button</name>
+    <message>
+        <source>Calendar Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mail Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Record Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Display Rotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lower+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Upper+Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorDialog</name>
+    <message>
+        <source>Hue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sat:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Val:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Red:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Green:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Blue:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha channel:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select color</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OColorPopupMenu</name>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>
+</context>
+<context>
+    <name>OFileSelector</name>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>OFontMenu</name>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Medium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>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>Repeating Event</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>End On:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>No End Date</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></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>WeekVar</translation>
     </message>
 </context>
 <context>
-    <name>OTimePickerDialogBase</name>
+    <name>ORecurranceWidget</name>
+    <message>
+        <source>No End Date</source>
+        <translation type="unfinished">No End Date</translation>
+    </message>
+    <message>
+        <source>days</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>week</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>months</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>years</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>,
+and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>, and </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No Repeat</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>day(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat On</source>
+        <translation type="unfinished">在某天重復</translation>
+    </message>
+    <message>
+        <source>Mon</source>
+        <translation type="unfinished">星期一</translation>
+    </message>
+    <message>
+        <source>Tue</source>
+        <translation type="unfinished">星期二</translation>
+    </message>
+    <message>
+        <source>Wed</source>
+        <translation type="unfinished">星期三</translation>
+    </message>
+    <message>
+        <source>Thu</source>
+        <translation type="unfinished">星期四</translation>
+    </message>
+    <message>
+        <source>Fri</source>
+        <translation type="unfinished">星期五</translation>
+    </message>
+    <message>
+        <source>Sat</source>
+        <translation type="unfinished">星期六</translation>
+    </message>
+    <message>
+        <source>Sun</source>
+        <translation type="unfinished">星期日</translation>
+    </message>
+    <message>
+        <source>week(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Repeat By</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>TimePicker</source>
-        <translation>TimePicker</translation>
+        <source>Day</source>
+        <translation type="unfinished">日</translation>
     </message>
     <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>month(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>year(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">每</translation>
+    </message>
+    <message>
+        <source>on </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTimePickerDialogBase</name>
+    <message>
         <source>Time:</source>
         <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deadline:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Emails: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Male</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Female</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every</source>
+        <translation type="unfinished">每</translation>
+    </message>
+    <message>
+        <source>%1 %2 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Every </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very high</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>High</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Very low</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is an all day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is a multiple day event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>nd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>rd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>th</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libopieobex.ts b/i18n/zh_TW/libopieobex.ts
index 7ef6816..8fd774c 100644
--- a/i18n/zh_TW/libopieobex.ts
+++ b/i18n/zh_TW/libopieobex.ts
@@ -1,50 +1,76 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
+    <name>OpieObex::OtherHandler</name>
     <message>
-        <source>OBEX Sending</source>
-        <translation>OBEX 傳送中</translation>
+        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sending:</source>
-        <translation>正在傳送:</translation>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>filename</source>
-        <translation>檔案名稱</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation>取消(&amp;C)</translation>
+        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ObexInc</name>
+    <name>OpieObex::SendWidget</name>
     <message>
-        <source>OBEX Receiving</source>
-        <translation>OBEX 接收</translation>
+        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>文字標籤1</translation>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filename</source>
-        <translation>檔案名稱</translation>
+        <source>IrDa is not enabled!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation>有個檔案傳送
-給您了.</translation>
+        <source>Searching for IrDa Devices.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insert</source>
-        <translation>插入</translation>
+        <source>Bluetooth is not available</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reject</source>
-        <translation>拒絕</translation>
+        <source>Searching for bluetooth Devices.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scheduling for beam.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click to beam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Try %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search again for IrDa.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start sending</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqdvorak.ts b/i18n/zh_TW/libqdvorak.ts
index 421dd31..83ab234 100644
--- a/i18n/zh_TW/libqdvorak.ts
+++ b/i18n/zh_TW/libqdvorak.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Dvorak</source>
-        <translation >Dvorak</translation>
+        <translation>Dvorak</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqhandwriting.ts b/i18n/zh_TW/libqhandwriting.ts
index 7fc15da..f5c5664 100644
--- a/i18n/zh_TW/libqhandwriting.ts
+++ b/i18n/zh_TW/libqhandwriting.ts
@@ -1,166 +1,162 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>HandwritingHelp</name>
     <message>
         <source>Handwriting Help</source>
         <translation>手寫說明</translation>
     </message>
     <message>
         <source>&lt;ul&gt;&lt;li&gt;When you start to use the handwriting recogniser write slowly, accurately and firmly.&lt;li&gt;Use the guide lines when drawing your characters.&lt;li&gt;When drawing a character with multiple strokes, each successive stroke must be drawn before the grayed strokes are erased.&lt;li&gt;Practice your handwriting using the handwriting trainer.&lt;li&gt;When adding your own character templates make sure they are sufficiently different from other characters&apos; templates.&lt;/ul&gt;</source>
         <translation>&lt;ul&gt;&lt;li&gt;當您開始使用手寫辨識時請緩慢, 確實地書寫.&lt;li&gt;在畫出您的字跡時請使用指導線.&lt;li&gt;在書寫具有多個筆劃的字時, 每一劃都必須在灰色的筆劃消失前完成.&lt;li&gt;使用手寫訓練程式來練習您的手寫.&lt;li&gt;要加入您自己的字元範本時請確定它們跟其他字元範本之間有足夠的差異.&lt;/ul&gt;</translation>
     </message>
     <message>
         <source>Tips</source>
         <translation>密訣</translation>
     </message>
     <message>
         <source>Trainer</source>
         <translation>訓練程式</translation>
     </message>
 </context>
 <context>
     <name>HandwritingTrainer</name>
     <message>
         <source>Matched: </source>
         <translation>完全符合的: </translation>
     </message>
     <message>
         <source>Similar to: </source>
         <translation>很類似的: </translation>
     </message>
     <message>
         <source>%1%</source>
         <translation>%1%</translation>
     </message>
     <message>
         <source>Select a reference character from the list.  Practice writing in the area on the right.</source>
         <translation>從清單中選擇參考的字元. 在右邊的區域中練習書寫.</translation>
     </message>
     <message>
         <source>No match</source>
         <translation>不符合</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Handwriting</source>
         <translation>手寫</translation>
     </message>
 </context>
 <context>
     <name>QIMPenEdit</name>
     <message>
         <source>New...</source>
         <translation>新的...</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <source>Default</source>
         <translation>預設</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInput</name>
     <message>
         <source>Shortcut</source>
         <translation>簡寫</translation>
     </message>
 </context>
 <context>
     <name>QIMPenInputCharDlg</name>
     <message>
         <source>Enter new character</source>
         <translation>輸入新字元</translation>
     </message>
     <message>
         <source>Character:</source>
         <translation>字元:</translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>Multi-stroke character timeout:</source>
         <translation>多筆劃字元逾時時間:</translation>
     </message>
     <message>
         <source>ms</source>
         <translation>毫秒</translation>
     </message>
     <message>
         <source>Input areas displayed</source>
         <translation>已顯示輸入區</translation>
     </message>
     <message>
         <source>Upper and lower case areas</source>
         <translation>大小寫區</translation>
     </message>
     <message>
         <source>Lower case (toggle Upper case)</source>
         <translation>小寫(切換則為大寫)</translation>
     </message>
 </context>
 <context>
     <name>QIMPenSetup</name>
     <message>
         <source>Setup Handwriting Input</source>
         <translation>設定手寫輸入</translation>
     </message>
     <message>
         <source>Character Profile:</source>
         <translation>字元資料檔:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation>偏好設定</translation>
     </message>
     <message>
         <source>Customize</source>
         <translation>自定</translation>
     </message>
     <message>
         <source>%1 ms</source>
         <translation>%1 毫秒</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>無法儲存資訊.
 請釋放一些空間後
 再試一次.
 
 無論如何都要離開?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqkjumpx.ts b/i18n/zh_TW/libqkjumpx.ts
index c2d8db3..2f0bdbc 100644
--- a/i18n/zh_TW/libqkjumpx.ts
+++ b/i18n/zh_TW/libqkjumpx.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>KJumpX</source>
-        <translation >KJumpX</translation>
+        <translation>KJumpX</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index eb657d8..f71ec64 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -1,902 +1,956 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Categories</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source> (multi.)</source>
         <translation> (多個.)</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>商務</translation>
     </message>
     <message>
         <source>Personal</source>
         <translation>個人</translation>
     </message>
 </context>
 <context>
     <name>CategoryCombo</name>
     <message>
         <source> (Multi.)</source>
         <translation> (多個.)</translation>
     </message>
 </context>
 <context>
     <name>CategoryEdit</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>New Category</source>
         <translation>新增類別</translation>
     </message>
     <message>
         <source>New Category </source>
         <translation>新類別</translation>
     </message>
 </context>
 <context>
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
         <translation>類別編輯</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation>類別</translation>
     </message>
     <message>
         <source>Application</source>
         <translation>應用程式</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
         <translation>類別到這裡</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>全域</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
         <translation>核取這個文件所屬的類別.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
         <translation>在這裡輸入新的類別. 按 &lt;b&gt;新增&lt;/b&gt; 來把它加到清單中.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
         <translation>在左邊輸入新類別並按下以便將它加入清單.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
         <translation>按下以刪除反白的類別.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
         <translation>核取以便讓所有的應用程式可以使用這個內容.</translation>
     </message>
 </context>
 <context>
     <name>CategoryMenu</name>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
 </context>
 <context>
     <name>CategorySelect</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Sorry, another application is
 editing categories.</source>
         <translation>對不起, 另一個應用程式正在
 編輯類別.</translation>
     </message>
     <message>
         <source>Edit Categories</source>
         <translation>編輯類別</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
 </context>
 <context>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
         <translation>顯示所選年份中的一月</translation>
     </message>
     <message>
         <source>Show the previous month</source>
         <translation>顯示上個月</translation>
     </message>
     <message>
         <source>Show the next month</source>
         <translation>顯示下個月</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
         <translation>顯示所選年份中的十二月</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
         <translation>關閉檔案選擇器</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
         <translation>顯示這個類型的文件</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
         <translation>顯示這個類別中的文件</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
         <translation>按一下以便自清單中選擇文件</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
         <translation>, 或選 &lt;b&gt;新增文件&lt;/b&gt; 來建立一個新文件.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
         <translation>&lt;br&gt;&lt;br&gt;按住並停留以獲知文件內容.</translation>
     </message>
 </context>
 <context>
     <name>FileSelectorView</name>
     <message>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>找不到字串.</translation>
     </message>
     <message>
         <source>End reached, starting at beginning</source>
         <translation>到達結尾, 從開頭處找起</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
         <source>Find what:</source>
         <translation>尋找什麼:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>類別:</translation>
     </message>
     <message>
         <source>Start Search at:</source>
         <translation>開始搜尋於:</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
         <translation>Dec 02 01</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
         <translation>區分大小寫</translation>
     </message>
     <message>
         <source>Search Backwards</source>
         <translation>向後搜尋</translation>
     </message>
 </context>
 <context>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
         <translation>文件檢視</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
         <translation>檔案偵測失敗.</translation>
     </message>
     <message>
         <source>Copy of </source>
         <translation>複製於 </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>重製</translation>
     </message>
     <message>
         <source>File copy failed.</source>
         <translation>檔案複製失敗.</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
         <translation>移動文件失敗.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Details</source>
         <translation>詳細資料</translation>
     </message>
     <message>
         <source>Comment:</source>
         <translation>註解:</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>類型:</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>名稱:</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>位置</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
         <translation>快速載入 (消耗記憶體)</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
         <translation>存放此文件的媒體.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
         <translation>這個文件的名稱.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
         <translation>預先載入此應用程式以便能馬上使用它.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
         <translation>刪除這個文件.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
         <translation>製作這個文件的副本.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
         <translation>將這個文件傳輸到另一個裝置.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
         <translation>使用自訂旋轉</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
         <translation>擁有者資訊</translation>
     </message>
 </context>
 <context>
     <name>PasswordBase</name>
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>3</source>
         <translation>3</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>6</source>
         <translation>6</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>0</source>
         <translation>0</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
 </context>
 <context>
+    <name>QMessageBox</name>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>There was a problem creating
 Configuration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>在為這個程式建立
 組態資訊
 時發生問題.
 
 請釋放一些空間並
 再試一次.</translation>
     </message>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>無法建立啟動檔案
 在開始輸入資料之前
 請先釋放一些空間</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>無法排程警示.
 請釋放一些記憶體並再試一次.</translation>
     </message>
     <message>
         <source>D</source>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
         <source>year</source>
         <translation>年</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</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>Are you sure you want to delete
  %1?</source>
-        <translation>您確定要刪除
+        <translation type="obsolete">您確定要刪除
  %1?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;工作地址:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;住家地阯:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
         <translation>電子郵件位址: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>住家電話: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>住家傳真: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>住家行動電話: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>個人網頁: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>商務網頁: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>辦公室: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>商務電話: </translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>商務傳真: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>商務行動電話: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>商務呼叫器: </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>職業: </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>助理:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>經理: </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>男性</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>女性</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>性別: </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>配偶: </translation>
     </message>
     <message>
         <source>Birthday: </source>
         <translation>生日: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
         <translation>周年紀念日: </translation>
     </message>
     <message>
         <source>Nickname: </source>
         <translation>暱稱: </translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>名稱 頭銜</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>名</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>中名</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>姓</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>稱呼</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>職稱</translation>
     </message>
     <message>
         <source>Department</source>
         <translation>部門</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Business Phone</source>
         <translation>商務電話</translation>
     </message>
     <message>
         <source>Business Fax</source>
         <translation>商務傳真</translation>
     </message>
     <message>
         <source>Business Mobile</source>
         <translation>商務行動電話</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>預設電子郵件</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
         <translation>住家電話</translation>
     </message>
     <message>
         <source>Home Fax</source>
         <translation>住家傳真</translation>
     </message>
     <message>
         <source>Home Mobile</source>
         <translation>住家行動電話</translation>
     </message>
     <message>
         <source>Business Street</source>
         <translation>辦公處 街道</translation>
     </message>
     <message>
         <source>Business City</source>
         <translation>辦公處 城市</translation>
     </message>
     <message>
         <source>Business State</source>
         <translation>辦公處 州</translation>
     </message>
     <message>
         <source>Business Zip</source>
         <translation>辦公處 郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
         <translation>辦公處 國家</translation>
     </message>
     <message>
         <source>Business Pager</source>
         <translation>商務呼叫器</translation>
     </message>
     <message>
         <source>Business WebPage</source>
         <translation>商務網址</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>辦公室</translation>
     </message>
     <message>
         <source>Profession</source>
         <translation>職業</translation>
     </message>
     <message>
         <source>Assistant</source>
         <translation>助理</translation>
     </message>
     <message>
         <source>Manager</source>
         <translation>經理</translation>
     </message>
     <message>
         <source>Home Street</source>
         <translation>住家 街道</translation>
     </message>
     <message>
         <source>Home City</source>
         <translation>住家 城市</translation>
     </message>
     <message>
         <source>Home State</source>
         <translation>住家 州</translation>
     </message>
     <message>
         <source>Home Zip</source>
         <translation>住家 郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
         <translation>住家 國家</translation>
     </message>
     <message>
         <source>Home Web Page</source>
         <translation>個人網頁</translation>
     </message>
     <message>
         <source>Spouse</source>
         <translation>配偶</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>性別</translation>
     </message>
     <message>
         <source>Birthday</source>
         <translation>生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
         <translation>周年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
         <translation>暱稱</translation>
     </message>
     <message>
         <source>Children</source>
         <translation>子女</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>備註</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>新增文件</translation>
     </message>
-</context>
-<context>
-    <name>QPEApplication</name>
     <message>
-        <source>%1 document</source>
-        <translation>%1 文件</translation>
+        <source>Click to close this window, discarding changes.</source>
+        <translation type="unfinished">按這裡關閉這個視窗, 放棄所做的變更.</translation>
+    </message>
+    <message>
+        <source>Click to close this window.</source>
+        <translation type="unfinished">按這裡關閉視窗.</translation>
+    </message>
+    <message>
+        <source>Click to close this window and apply changes.</source>
+        <translation type="unfinished">按這裡關閉視窗並接受所有的變更.</translation>
+    </message>
+    <message>
+        <source>Click to make this window moveable.</source>
+        <translation type="unfinished">按這裡讓這個視窗可以移動.</translation>
+    </message>
+    <message>
+        <source>Click to make this window use all available screen area.</source>
+        <translation type="unfinished">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
     </message>
-</context>
-<context>
-    <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation>&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
+        <translation type="unfinished">&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation>這是什麼...</translation>
+        <translation type="unfinished">這是什麼...</translation>
     </message>
-</context>
-<context>
-    <name>QPEManager</name>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation>按這裡關閉這個視窗, 放棄所做的變更.</translation>
+        <source>&lt;qt&gt;Are you sure you want to delete
+ %1?&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window.</source>
-        <translation>按這裡關閉視窗.</translation>
+        <source>Jan</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation>按這裡關閉視窗並接受所有的變更.</translation>
+        <source>Feb</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window moveable.</source>
-        <translation>按這裡讓這個視窗可以移動.</translation>
+        <source>Mar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation>按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
+        <source>Apr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jun</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jul</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Aug</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sep</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Oct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nov</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dec</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QPEApplication</name>
+    <message>
+        <source>%1 document</source>
+        <translation>%1 文件</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
         <translation>找不到 城市時間 可執行檔</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
         <translation>為了選擇時區,
 請安裝城市時間.</translation>
     </message>
 </context>
 <context>
     <name>TimerReceiverObject</name>
     <message>
         <source>Out of Space</source>
         <translation>空間不足</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Please free up space and try again</source>
         <translation>無法排程警示.
 請釋放空間後再試一次</translation>
     </message>
 </context>
 <context>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
         <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
         <translation>全部 %1 個檔案</translation>
     </message>
     <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpickboard.ts b/i18n/zh_TW/libqpickboard.ts
index 468515a..7eef6c6 100644
--- a/i18n/zh_TW/libqpickboard.ts
+++ b/i18n/zh_TW/libqpickboard.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
-        <translation >Pickboard</translation>
+        <translation>Pickboard</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqunikeyboard.ts b/i18n/zh_TW/libqunikeyboard.ts
index ecacc23..caf766c 100644
--- a/i18n/zh_TW/libqunikeyboard.ts
+++ b/i18n/zh_TW/libqunikeyboard.ts
@@ -1,9 +1,9 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
-        <translation >Unicode</translation>
+        <translation>Unicode</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libscreenshotapplet.ts b/i18n/zh_TW/libscreenshotapplet.ts
index 84f00d8..81a2422 100644
--- a/i18n/zh_TW/libscreenshotapplet.ts
+++ b/i18n/zh_TW/libscreenshotapplet.ts
@@ -1,17 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ScreenshotControl</name>
     <message>
-        <source>Snapshot</source>
-        <translation>Snapshot</translation>
+        <source>Name of screenshot </source>
+        <translation>檔案名稱</translation>
     </message>
     <message>
-        <source>scap</source>
-        <translation>scap</translation>
+        <source>Delay</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of screenshot </source>
-        <translation>檔案名稱</translation>
+        <source>sec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save named</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save screenshot as...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Screenshot was uploaded to %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connection to %1 failed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodayaddressbookplugin.ts b/i18n/zh_TW/libtodayaddressbookplugin.ts
index 2f40ece..29bd54f 100644
--- a/i18n/zh_TW/libtodayaddressbookplugin.ts
+++ b/i18n/zh_TW/libtodayaddressbookplugin.ts
@@ -1,93 +1,89 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodaydatebookplugin.ts b/i18n/zh_TW/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/zh_TW/libtodaydatebookplugin.ts
+++ b/i18n/zh_TW/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodaytodolistplugin.ts b/i18n/zh_TW/libtodaytodolistplugin.ts
index b2f3c04..ed4b5a5 100644
--- a/i18n/zh_TW/libtodaytodolistplugin.ts
+++ b/i18n/zh_TW/libtodaytodolistplugin.ts
@@ -1,40 +1,43 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>待辦事項 plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodolistPluginConfig</name>
+    <name>TodoPluginConfigBase</name>
     <message>
-        <source>tasks shown </source>
+        <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set the maximum number of task that should be shown</source>
+        <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clip line after X chars</source>
+        <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>After how many chars should be the info about the task be cut off</source>
+        <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>TodolistPluginConfig</name>
+</context>
 </TS>
diff --git a/i18n/unmaintained/ko/libmpeg3plugin.ts b/i18n/zh_TW/libtremorplugin.ts
index 4eb9e18..4eb9e18 100644
--- a/i18n/unmaintained/ko/libmpeg3plugin.ts
+++ b/i18n/zh_TW/libtremorplugin.ts
diff --git a/i18n/zh_TW/libvolumeapplet.ts b/i18n/zh_TW/libvolumeapplet.ts
index 4995ad2..e796c5e 100644
--- a/i18n/zh_TW/libvolumeapplet.ts
+++ b/i18n/zh_TW/libvolumeapplet.ts
@@ -1,21 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>VolumeControl</name>
     <message>
         <source>Enable Sounds for:</source>
         <translation>啟動 音效:</translation>
     </message>
     <message>
         <source>Alarm Sound</source>
         <translation>鬧鐘</translation>
     </message>
     <message>
         <source>Key Clicks</source>
-        <translation >鍵般</translation>
+        <translation>鍵般</translation>
     </message>
     <message>
         <source>Screen Taps</source>
-        <translation >觸控</translation>
+        <translation>觸控</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libwirelessapplet.ts b/i18n/zh_TW/libwirelessapplet.ts
index 993457c..c53fcef 100644
--- a/i18n/zh_TW/libwirelessapplet.ts
+++ b/i18n/zh_TW/libwirelessapplet.ts
@@ -1,29 +1,29 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedConfigBase</name>
     <message>
         <source>Advanced Config</source>
-        <translation >進階設定</translation>
+        <translation>進階設定</translation>
     </message>
     <message>
         <source>Renew DHCP on changing</source>
-        <translation >在切換時更新DHCP</translation>
+        <translation>在切換時更新DHCP</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation >頻率</translation>
+        <translation>頻率</translation>
     </message>
     <message>
         <source>MODE</source>
-        <translation >模式</translation>
+        <translation>模式</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation >ESSID</translation>
+        <translation>ESSID</translation>
     </message>
     <message>
         <source>AccessPoint</source>
-        <translation >AccessPoint</translation>
+        <translation>AccessPoint</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
new file mode 100644
index 0000000..868d0d1
--- a/dev/null
+++ b/i18n/zh_TW/libwlan.ts
@@ -0,0 +1,140 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libwlanplugin.ts b/i18n/zh_TW/libwlanplugin.ts
new file mode 100644
index 0000000..216af89
--- a/dev/null
+++ b/i18n/zh_TW/libwlanplugin.ts
@@ -0,0 +1,136 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>WLAN</name>
+    <message>
+        <source>Wireless Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESS-ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MAC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Managed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ad-Hoc</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>any</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Key Setting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key &amp;4</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>WlanInfo</name>
+    <message>
+        <source>Interface Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>802.11b</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ESSID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Station</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quality</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Noise</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/mailit.ts b/i18n/zh_TW/mailit.ts
index d61ee1d..3d729bc 100644
--- a/i18n/zh_TW/mailit.ts
+++ b/i18n/zh_TW/mailit.ts
@@ -1,531 +1,605 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddAtt</name>
     <message>
         <source>Attached</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>attach...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Adding attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create new Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>POP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SMTP server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Synchronize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail Size (k)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EmailClient</name>
     <message>
         <source>Idle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accounts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get Mail in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You must create an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>getMail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>select account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click to download mail via all available accounts.
  Press and hold to select the desired account.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No account associated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is no active account 
 associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Login failed
+Check user name and password&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Receiving error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
     <message>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MailItWindow</name>
     <message>
         <source>Write mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Examine mail</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Central view area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail not downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail you have clicked 
 has not been downloaded yet.
  Would you like to do it now ?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read Mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PopClient</name>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error Occured</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Retrieving </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completing message </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> new messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new messages</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DNS lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>The mail subject should be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>If you would like to send copies of your mail they can be entered here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This button opens the address selector with all mail adresses from your OPIE addressbook</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Enter your mail text here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Queue your mail by clicking here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an overview about all attachments in the mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the inbox view.
 It keeps the fetched mail which can be 
 viewed by double clicking the entry.
 blue attachment icon shows whether this 
 mailhas attachments.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is the outbox view.
 It keeps the queued mails to send which can be 
 reviewed by double clicking the entry.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Choose the recipients from this list</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ReadMail</name>
     <message>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attatchments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to forward the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the previous mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read the next mail in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add attachments to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The mail view has 2 modes:
 &lt;LI&gt;&lt;B&gt;RichText&lt;/B&gt; shows the mail as HTML with reach features (no standard line breaks)&lt;/LI&gt;&lt;LI&gt;&lt;B&gt;Plain&lt;/B&gt; shows the mail as standard plain text&lt;/LI&gt;Click here to switch between those view modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to remove the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to download the selected mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>reply to mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail
 Press and hold for more options.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SmtpClient</name>
     <message>
         <source>DNS lookup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> messages</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewAtt</name>
     <message>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to install the attachment to your Documents</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Exploring attatchments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attatchment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>WriteMail</name>
     <message>
         <source>&amp;Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enque mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>To:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Subject:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to attach files to your mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This button puts your mail in the send queue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send mail to whom?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======forwarded message from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> starts======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FWD: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>======end of forwarded message======
 
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> wrote on </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mediummount.ts b/i18n/zh_TW/mediummount.ts
index 53fbf9b..9462ee5 100644
--- a/i18n/zh_TW/mediummount.ts
+++ b/i18n/zh_TW/mediummount.ts
@@ -1,87 +1,95 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MainWindow</name>
+    <name>MediumMountSetting::MainWindow</name>
+    <message>
+        <source>Medium Mount Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Global</source>
-        <translation>全域</translation>
+        <translation type="unfinished">全域</translation>
     </message>
 </context>
 <context>
-    <name>MediumGlobalWidget</name>
+    <name>MediumMountSetting::MediumGlobalWidget</name>
+    <message>
+        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Enable medium checking</source>
-        <translation>啟用媒體檢查</translation>
+        <translation type="unfinished">啟用媒體檢查</translation>
     </message>
     <message>
         <source>Use global settings</source>
-        <translation>使用全域設定</translation>
+        <translation type="unfinished">使用全域設定</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>哪種媒體檔案</translation>
+        <translation type="unfinished">哪種媒體檔案</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>音訊</translation>
+        <translation type="unfinished">音訊</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>全部</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>影像</translation>
+        <translation type="unfinished">影像</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>文字</translation>
+        <translation type="unfinished">文字</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>視訊</translation>
+        <translation type="unfinished">視訊</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountWidget</name>
+    <name>MediumMountSetting::MediumMountWidget</name>
+    <message>
+        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Which media files</source>
-        <translation>哪種媒體檔案</translation>
+        <translation type="unfinished">哪種媒體檔案</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>音訊</translation>
+        <translation type="unfinished">音訊</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>所有</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>影像</translation>
+        <translation type="unfinished">影像</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>文字</translation>
+        <translation type="unfinished">文字</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>視訊</translation>
+        <translation type="unfinished">視訊</translation>
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation>限制搜尋為:</translation>
+        <translation type="unfinished">限制搜尋為:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>新增</translation>
+        <translation type="unfinished">新增</translation>
     </message>
     <message>
         <source>Always check this medium</source>
-        <translation>永遠檢查這類媒體</translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application get&apos;s closed. To update the Document Tab you need to removeand insert this medium.</source>
-        <translation>設定這個媒體. 這些變更會在應用程式關閉之後產生效用. 要更新文件索引標籤, 您需要移除並重新插入這個媒體.</translation>
+        <translation type="unfinished">永遠檢查這類媒體</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index e031976..8f00160 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/minesweep.ts
@@ -1,33 +1,33 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
-        <translation >你贏了!</translation>
+        <translation>你贏了!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>你爆了!</translation>
     </message>
     <message>
         <source>Mine Hunt</source>
         <translation>採地雷</translation>
     </message>
     <message>
         <source>Beginner</source>
         <translation>初學</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation >進階</translation>
+        <translation>進階</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>專家</translation>
     </message>
     <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/mobilemsg.ts b/i18n/zh_TW/mobilemsg.ts
index 0193e2e..ec61fa7 100644
--- a/i18n/zh_TW/mobilemsg.ts
+++ b/i18n/zh_TW/mobilemsg.ts
@@ -1,72 +1,49 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation>訊息: </translation>
-    </message>
-</context>
-<context>
     <name>MobileMsgBase</name>
     <message>
         <source>Mobile Messaging</source>
         <translation>手機簡訊</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>號碼:</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>傳送</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>文字</translation>
-    </message>
-    <message>
         <source>Flash</source>
         <translation>Flash</translation>
     </message>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
-        <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
-    </message>
-    <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
-        <source>Country:</source>
-        <translation>國家:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation>商標</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation>群組</translation>
+        <source>EMS</source>
+        <translation>EMS</translation>
     </message>
     <message>
-        <source>Picture</source>
-        <translation>相片</translation>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Message:</source>
-        <translation>訊息:</translation>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>EMS</source>
-        <translation>EMS</translation>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tab</source>
-        <translation>索引標籤</translation>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/networksettings.ts b/i18n/zh_TW/networksettings.ts
index b7552a6..11d8782 100644
--- a/i18n/zh_TW/networksettings.ts
+++ b/i18n/zh_TW/networksettings.ts
@@ -1,88 +1,131 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Services</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connections</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>t</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>&amp;Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Set Current</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Profile</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>A list of network settings to be choosen from</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new interface to the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Start/Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start and Stop the current interface, gives additional information about the interface.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure the current interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove the current interface from the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindowImp</name>
+    <message>
+        <source>Disconnected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to remove.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select an interface first.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/odict.ts b/i18n/zh_TW/odict.ts
index 5b587d8..d887ab1 100644
--- a/i18n/zh_TW/odict.ts
+++ b/i18n/zh_TW/odict.ts
@@ -1,127 +1,111 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General Settings</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searchmethods</source>
+        <source>Change</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 Errors</source>
+        <source>Parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 Errors</source>
+        <source>No dictionary defined</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Until Hit</source>
+        <source>&amp;Define one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Error tolerance</source>
+        <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Parameter</source>
+        <source>Opie-Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Decollator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change Searchmethod</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opie-console.ts b/i18n/zh_TW/opie-console.ts
index 9cdeb11..33bfa8f 100644
--- a/i18n/zh_TW/opie-console.ts
+++ b/i18n/zh_TW/opie-console.ts
@@ -1,855 +1,878 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Init string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hang-up string </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial time </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay before redial </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number of tries </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto bps detect </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Multi-line untag </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Or peer mac address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>ConfigDialog</name>
+    <message>
+        <source>Edit Connection Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Environment Variables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Value :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IO Layer:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Foreground:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>White</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micro</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Key</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Flow control</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hardware</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Odd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Even</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Bits</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1.5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>115200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>57600 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>38400 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>19200 baud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9600 baud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Device is already connected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>QuickLaunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New from Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>History</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AT commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter number</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto connect after load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>New Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer protocol</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ready</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file has been specified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sending...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Receiving...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation not supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File has been received.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Special Keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Z-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Y-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Serial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancelling...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset speakers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dial number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection established</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dismiss</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>medium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line-break conversions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local echo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 100</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>VT 102</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Linux Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>X-Terminal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>black on white</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>white on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>green on black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>orange on black</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index a14ee1e..f900e1d 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -1,86 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>確實而精準地點一下十字準線, 
 以便校正您的螢幕.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>歡迎使用 Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>登入</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;歡迎使用 OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>重新啟動</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
         <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>錯誤的密碼</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>輸入的密碼不正確.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation>OPIE 被沒有抓到的信號
+        <translation type="obsolete">OPIE 被沒有抓到的信號
 (%1) 
 中止了</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>失敗</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
-        <translation>無法啟動 OPIE.</translation>
+        <translation type="obsolete">無法啟動 OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>無法切換為新的使用者身分</translation>
     </message>
+    <message>
+        <source>Opie was terminated
+by an uncaught signal
+(%1)
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start Opie.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index 70f7b42..f105433 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -1,253 +1,249 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
         <translation>OpieFtp</translation>
     </message>
     <message>
         <source>Connection</source>
         <translation>連線</translation>
     </message>
     <message>
         <source>Local</source>
         <translation>本地</translation>
     </message>
     <message>
         <source>Remote</source>
         <translation>遠端</translation>
     </message>
     <message>
         <source>View</source>
         <translation>檢視</translation>
     </message>
     <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Connect</source>
         <translation>連線</translation>
     </message>
     <message>
         <source>Disconnect</source>
         <translation>斷線</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
         <translation>顯示隱藏檔案</translation>
     </message>
     <message>
         <source>Upload</source>
         <translation>上傳</translation>
     </message>
     <message>
         <source>Make Directory</source>
         <translation>建立目錄</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>更名</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Download</source>
         <translation>下載</translation>
     </message>
     <message>
         <source>Switch to Local</source>
         <translation>切換到本地</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
         <translation>切換到遠端</translation>
     </message>
     <message>
         <source>Switch to Config</source>
         <translation>切換到設定</translation>
     </message>
     <message>
         <source>File</source>
         <translation>名稱</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>修改日期</translation>
     </message>
     <message>
         <source>Dir</source>
         <translation>目錄</translation>
     </message>
     <message>
         <source>Username</source>
         <translation>帳號</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
         <source>Remote server</source>
         <translation>遠端主機位置</translation>
     </message>
     <message>
         <source>Remote path</source>
         <translation>遠端主機目錄</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>連接埠</translation>
     </message>
     <message>
         <source>Config</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Ftp</source>
         <translation>Ftp</translation>
     </message>
     <message>
         <source>Please set the server info</source>
         <translation>請設定主機資訊</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>確定</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>附註</translation>
     </message>
     <message>
         <source>Unable to connect to
 </source>
         <translation>無法建立連線
 </translation>
     </message>
     <message>
         <source>Unable to log in
 </source>
         <translation>無法登入
 </translation>
     </message>
     <message>
         <source>Unable to upload
 </source>
         <translation>無法上傳
 </translation>
     </message>
     <message>
         <source>Cannot upload directories</source>
         <translation>無法上傳目錄</translation>
     </message>
     <message>
         <source>Unable to download 
 </source>
         <translation>無法下載
 </translation>
     </message>
     <message>
         <source>Unable to list the directory
 </source>
         <translation>無法列出此目錄檔案清單
 </translation>
     </message>
     <message>
         <source>Unable to change directories
 </source>
         <translation>無法切換目錄
 </translation>
     </message>
     <message>
         <source>Unable to cd up
 </source>
         <translation>無法到上層目錄
 </translation>
     </message>
     <message>
         <source>Unable to get working dir
 </source>
         <translation>無法進入工作目錄
 </translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>切換目錄</translation>
     </message>
     <message>
         <source>Do you really want to delete
 </source>
         <translation>確定刪除
 </translation>
     </message>
     <message>
         <source> ?
 It must be empty</source>
         <translation> ?
 這個目錄必須是空的</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>竊定</translation>
     </message>
     <message>
         <source>No</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Unable to make directory
 </source>
         <translation>無法新建目錄
 </translation>
     </message>
     <message>
         <source>Unable to remove directory
 </source>
         <translation>無法刪除目錄
 </translation>
     </message>
     <message>
         <source>Unable to delete file
 </source>
         <translation>無法刪除檔案
 </translation>
     </message>
     <message>
         <source>Unable to rename file
 </source>
         <translation>無法更名檔案
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>無法更名</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>目錄並不存在</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation>重新整理</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>新主機名稱</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>名稱已經存在</translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/i18n/zh_TW/opieirc.ts b/i18n/zh_TW/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/zh_TW/opieirc.ts
+++ b/i18n/zh_TW/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieplayer.ts b/i18n/zh_TW/opieplayer.ts
index 5550911..2e20696 100644
--- a/i18n/zh_TW/opieplayer.ts
+++ b/i18n/zh_TW/opieplayer.ts
@@ -1,275 +1,275 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioDevice</name>
     <message>
         <source>Somethin&apos;s wrong with
 your sound device.
 open(&quot;/dev/dsp&quot;)
 </source>
         <translation>您的聲音裝置
 有些問題. 
 開啟(&quot;/dev/dsp&quot;)</translation>
     </message>
     <message>
         <source>
 
 Closing player now.</source>
         <translation>
 
 現在正在關閉播放程式.</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>放棄</translation>
     </message>
 </context>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Opie播放程式</translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>No file</source>
         <translation>沒有檔案</translation>
     </message>
     <message>
         <source>Error: There is no file selected</source>
         <translation>錯誤: 尚未選擇檔案</translation>
     </message>
     <message>
         <source>File not found</source>
         <translation>找不到檔案</translation>
     </message>
     <message>
         <source>The following file was not found: &lt;i&gt;</source>
         <translation>找不到下列檔案: &lt;i&gt;</translation>
     </message>
     <message>
         <source>No decoder found</source>
         <translation>找不到解碼器</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
         <translation>抱歉, 找不到適用於這個檔案的解碼器: &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
         <translation>開啟檔案時發生錯誤</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
         <translation>抱歉, 在嘗試播放此檔案時發生錯誤: &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
         <translation> 檔案: </translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation>, 長度: </translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>音樂</translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation>播放清單選擇</translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Opie播放程式</translation>
     </message>
     <message>
         <source>Play Operations</source>
         <translation>播放作業</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
         <translation>新增至播放清單</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation>自播放清單中移除</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation>隨機選曲</translation>
     </message>
     <message>
         <source>Loop</source>
         <translation>循環播放</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation>清除清單</translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation>加入所有的音訊檔案</translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation>加入所有的視訊檔案</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>加入所有檔案</translation>
     </message>
     <message>
         <source>Save PlayList</source>
         <translation>儲存播放清單</translation>
     </message>
     <message>
         <source>Open File or URL</source>
         <translation>開啟檔案或網址</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
         <translation>重新描掃音訊檔案</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>重新描掃視訊檔案</translation>
     </message>
     <message>
         <source>View</source>
         <translation>檢視</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>縮放</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>移除</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>標題</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>媒體</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>音訊</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>視訊</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>清單</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>Opie播放程式: </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>空間不足</translation>
+        <translation type="obsolete">空間不足</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>儲存播放清單時發生問題.
+        <translation type="obsolete">儲存播放清單時發生問題.
 當您下次啟動播放清單時可能會發現
 其中的某些項目遺失了.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>無效的檔案</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>取得該檔案時發生問題.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>移除播放清單?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>您確定要刪除
 這個播放清單?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>內容</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>播放選擇的</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>開啟檔案或網址</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>儲存 m3u 播放清單 </translation>
     </message>
     <message>
         <source>Skins</source>
         <translation>外皮</translation>
     </message>
     <message>
         <source>Path</source>
         <translation>路徑</translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation>Opie播放程式</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opieplayer2.ts b/i18n/zh_TW/opieplayer2.ts
index 2b25e91..8b4595f 100644
--- a/i18n/zh_TW/opieplayer2.ts
+++ b/i18n/zh_TW/opieplayer2.ts
@@ -1,239 +1,239 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AudioWidget</name>
     <message>
         <source>OpiePlayer</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediaPlayer</name>
     <message>
         <source>OpiePlayer: Initializating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, Length: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListFileView</name>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Path</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListSelection</name>
     <message>
         <source>Playlist Selection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidget</name>
     <message>
         <source>Add to Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Randomize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all audio files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all video files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Playlist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Rescan for Audio Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open file or URL</source>
+        <source>OpiePlayer: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>OpiePlayer: </source>
+        <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save m3u Playlist </source>
+        <source>Add  URL</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlayListWidgetGui</name>
     <message>
         <source>Play Operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gamma (Video)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lists</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoWidget</name>
     <message>
         <source>OpiePlayer - Video</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>XineControl</name>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No input plugin found for this media type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No demux plugin found for this media type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Demuxing failed for this media type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malformed MRL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some other error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opierec.ts b/i18n/zh_TW/opierec.ts
new file mode 100644
index 0000000..7f32700
--- a/dev/null
+++ b/i18n/zh_TW/opierec.ts
@@ -0,0 +1,208 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QtRec</name>
+    <message>
+        <source>OpieRecord </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sample Rate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>44100</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>32000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>22050</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>11025</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8000</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Limit Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unlimited</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Directory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bit Depth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Low Disk Space</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are running low of
+recording space
+or a card isn&apos;t being recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
+the selected file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opierec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please select file to  play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not open audio file.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send with Ir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir Beam out</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ir sent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wave Compression (smaller files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/osearch.ts b/i18n/zh_TW/osearch.ts
new file mode 100644
index 0000000..3cda67d
--- a/dev/null
+++ b/i18n/zh_TW/osearch.ts
@@ -0,0 +1,123 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>OSearch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Case sensitiv</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use wildcards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The details of the current result</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your search terms here</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Applications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Todo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OListView</name>
+    <message>
+        <source>Results</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open in filemanager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>open with </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show completed tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show past events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search in dates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mimetype: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>search content</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>searching %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index 2083bf8..38a07db 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -1,570 +1,562 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>計算</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <source>Form1</source>
-        <translation>表單1</translation>
-    </message>
-    <message>
         <source>Molecular Weight</source>
         <translation>分子量</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>化學式</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>分子量 (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>元素成分 (%):</translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation>重量:</translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>區塊</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>電負度</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>原子半徑</translation>
     </message>
     <message>
         <source>Ionizationenergie</source>
         <translation>游離能</translation>
     </message>
     <message>
         <source>Density</source>
         <translation>密度</translation>
     </message>
     <message>
         <source>Boilingpoint</source>
         <translation>沸點</translation>
     </message>
     <message>
         <source>Meltingpoint</source>
         <translation>熔點</translation>
     </message>
     <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
         <source>%1 pm</source>
         <translation>%1 pm</translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation>%1 g/cm^3</translation>
     </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Oxygen</name>
     <message>
         <source>Oxygen</source>
         <translation>Oxygen</translation>
     </message>
     <message>
         <source>PSE</source>
         <translation>PSE</translation>
     </message>
     <message>
         <source>Data</source>
         <translation>資料</translation>
     </message>
     <message>
         <source>Calculations</source>
         <translation>計算結果</translation>
     </message>
-</context>
-<context>
-    <name>PSEWidget</name>
-    <message>
-        <source>Periodic System</source>
-        <translation>週期系統</translation>
-    </message>
-</context>
-<context>
-    <name>calcDlgUI</name>
-    <message>
-        <source>ERROR: 
-</source>
-        <translation>錯誤: 
-</translation>
-    </message>
-</context>
-<context>
-    <name>dataWidgetUI</name>
-    <message>
-        <source>Chemical Data</source>
-        <translation>Chemical Data</translation>
-    </message>
     <message>
         <source>Hydrogen</source>
-        <translation>氫</translation>
+        <translation type="unfinished">氫</translation>
     </message>
     <message>
         <source>Helium</source>
-        <translation>氦</translation>
+        <translation type="unfinished">氦</translation>
     </message>
     <message>
         <source>Lithium</source>
-        <translation>鋰</translation>
+        <translation type="unfinished">鋰</translation>
     </message>
     <message>
         <source>Beryllium</source>
-        <translation>鈹</translation>
+        <translation type="unfinished">鈹</translation>
     </message>
     <message>
         <source>Boron</source>
-        <translation>硼</translation>
+        <translation type="unfinished">硼</translation>
     </message>
     <message>
         <source>Carbon</source>
-        <translation>碳</translation>
+        <translation type="unfinished">碳</translation>
     </message>
     <message>
         <source>Nitrogen</source>
-        <translation>氮</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation>氧</translation>
+        <translation type="unfinished">氮</translation>
     </message>
     <message>
         <source>Fluorine</source>
-        <translation>氟</translation>
+        <translation type="unfinished">氟</translation>
     </message>
     <message>
         <source>Neon</source>
-        <translation>氖</translation>
+        <translation type="unfinished">氖</translation>
     </message>
     <message>
         <source>Sodium</source>
-        <translation>鈉</translation>
+        <translation type="unfinished">鈉</translation>
     </message>
     <message>
         <source>Magnesium</source>
-        <translation>鎂</translation>
+        <translation type="unfinished">鎂</translation>
     </message>
     <message>
         <source>Aluminum</source>
-        <translation>鋁</translation>
+        <translation type="unfinished">鋁</translation>
     </message>
     <message>
         <source>Silicon</source>
-        <translation>矽</translation>
+        <translation type="unfinished">矽</translation>
     </message>
     <message>
         <source>Phosphorus</source>
-        <translation>磷</translation>
+        <translation type="unfinished">磷</translation>
     </message>
     <message>
         <source>Sulfur</source>
-        <translation>硫</translation>
+        <translation type="unfinished">硫</translation>
     </message>
     <message>
         <source>Chlorine</source>
-        <translation>氯</translation>
+        <translation type="unfinished">氯</translation>
     </message>
     <message>
         <source>Argon</source>
-        <translation>氬</translation>
+        <translation type="unfinished">氬</translation>
     </message>
     <message>
         <source>Potassium</source>
-        <translation>鉀</translation>
+        <translation type="unfinished">鉀</translation>
     </message>
     <message>
         <source>Calcium</source>
-        <translation>鈣</translation>
+        <translation type="unfinished">鈣</translation>
     </message>
     <message>
         <source>Scandium</source>
-        <translation>鈧</translation>
+        <translation type="unfinished">鈧</translation>
     </message>
     <message>
         <source>Titanium</source>
-        <translation>鈦</translation>
+        <translation type="unfinished">鈦</translation>
     </message>
     <message>
         <source>Vanadium</source>
-        <translation>釩</translation>
+        <translation type="unfinished">釩</translation>
     </message>
     <message>
         <source>Chromium</source>
-        <translation>鉻</translation>
+        <translation type="unfinished">鉻</translation>
     </message>
     <message>
         <source>Manganese</source>
-        <translation>錳</translation>
+        <translation type="unfinished">錳</translation>
     </message>
     <message>
         <source>Iron</source>
-        <translation>鐵</translation>
+        <translation type="unfinished">鐵</translation>
     </message>
     <message>
         <source>Cobalt</source>
-        <translation>鈷</translation>
+        <translation type="unfinished">鈷</translation>
     </message>
     <message>
         <source>Nickel</source>
-        <translation>鎳</translation>
+        <translation type="unfinished">鎳</translation>
     </message>
     <message>
         <source>Copper</source>
-        <translation>銅</translation>
+        <translation type="unfinished">銅</translation>
     </message>
     <message>
         <source>Zinc</source>
-        <translation>鋅</translation>
+        <translation type="unfinished">鋅</translation>
     </message>
     <message>
         <source>Gallium</source>
-        <translation>鎵</translation>
+        <translation type="unfinished">鎵</translation>
     </message>
     <message>
         <source>Germanium</source>
-        <translation>鍺</translation>
+        <translation type="unfinished">鍺</translation>
     </message>
     <message>
         <source>Arsenic</source>
-        <translation>砷</translation>
+        <translation type="unfinished">砷</translation>
     </message>
     <message>
         <source>Selenium</source>
-        <translation>硒</translation>
+        <translation type="unfinished">硒</translation>
     </message>
     <message>
         <source>Bromine</source>
-        <translation>溴</translation>
+        <translation type="unfinished">溴</translation>
     </message>
     <message>
         <source>Krypton</source>
-        <translation>氪</translation>
+        <translation type="unfinished">氪</translation>
     </message>
     <message>
         <source>Rubidium</source>
-        <translation>銣</translation>
+        <translation type="unfinished">銣</translation>
     </message>
     <message>
         <source>Strontium</source>
-        <translation>鍶</translation>
+        <translation type="unfinished">鍶</translation>
     </message>
     <message>
         <source>Yttrium</source>
-        <translation>釔</translation>
+        <translation type="unfinished">釔</translation>
     </message>
     <message>
         <source>Zirconium</source>
-        <translation>鋯</translation>
+        <translation type="unfinished">鋯</translation>
     </message>
     <message>
         <source>Niobium</source>
-        <translation>鈮</translation>
+        <translation type="unfinished">鈮</translation>
     </message>
     <message>
         <source>Molybdenum</source>
-        <translation>鉬</translation>
+        <translation type="unfinished">鉬</translation>
     </message>
     <message>
         <source>Technetium</source>
-        <translation>鎝</translation>
+        <translation type="unfinished">鎝</translation>
     </message>
     <message>
         <source>Ruthenium</source>
-        <translation>釕</translation>
+        <translation type="unfinished">釕</translation>
     </message>
     <message>
         <source>Rhodium</source>
-        <translation>銠</translation>
+        <translation type="unfinished">銠</translation>
     </message>
     <message>
         <source>Palladium</source>
-        <translation>鈀</translation>
+        <translation type="unfinished">鈀</translation>
     </message>
     <message>
         <source>Silver</source>
-        <translation>銀</translation>
+        <translation type="unfinished">銀</translation>
     </message>
     <message>
         <source>Cadmium</source>
-        <translation>鎘</translation>
+        <translation type="unfinished">鎘</translation>
     </message>
     <message>
         <source>Indium</source>
-        <translation>銦</translation>
+        <translation type="unfinished">銦</translation>
     </message>
     <message>
         <source>Tin</source>
-        <translation>錫</translation>
+        <translation type="unfinished">錫</translation>
     </message>
     <message>
         <source>Antimony</source>
-        <translation>銻</translation>
+        <translation type="unfinished">銻</translation>
     </message>
     <message>
         <source>Tellurium</source>
-        <translation>碲</translation>
+        <translation type="unfinished">碲</translation>
     </message>
     <message>
         <source>Iodine</source>
-        <translation>碘</translation>
+        <translation type="unfinished">碘</translation>
     </message>
     <message>
         <source>Xenon</source>
-        <translation>氙</translation>
+        <translation type="unfinished">氙</translation>
     </message>
     <message>
         <source>Cesium</source>
-        <translation>銫</translation>
+        <translation type="unfinished">銫</translation>
     </message>
     <message>
         <source>Barium</source>
-        <translation>鋇</translation>
+        <translation type="unfinished">鋇</translation>
     </message>
     <message>
         <source>Lanthanum</source>
-        <translation>鑭</translation>
+        <translation type="unfinished">鑭</translation>
     </message>
     <message>
         <source>Cerium</source>
-        <translation>鈰</translation>
+        <translation type="unfinished">鈰</translation>
     </message>
     <message>
         <source>Praseodymium</source>
-        <translation>鐠</translation>
+        <translation type="unfinished">鐠</translation>
     </message>
     <message>
         <source>Neodymium</source>
-        <translation>釹</translation>
+        <translation type="unfinished">釹</translation>
     </message>
     <message>
         <source>Promethium</source>
-        <translation>鉅</translation>
+        <translation type="unfinished">鉅</translation>
     </message>
     <message>
         <source>Samarium</source>
-        <translation>釤</translation>
+        <translation type="unfinished">釤</translation>
     </message>
     <message>
         <source>Europium</source>
-        <translation>銪</translation>
+        <translation type="unfinished">銪</translation>
     </message>
     <message>
         <source>Gadolinium</source>
-        <translation>釓</translation>
+        <translation type="unfinished">釓</translation>
     </message>
     <message>
         <source>Terbium</source>
-        <translation>鋱</translation>
+        <translation type="unfinished">鋱</translation>
     </message>
     <message>
         <source>Dysprosium</source>
-        <translation>鏑</translation>
+        <translation type="unfinished">鏑</translation>
     </message>
     <message>
         <source>Holmium</source>
-        <translation>鈥</translation>
+        <translation type="unfinished">鈥</translation>
     </message>
     <message>
         <source>Erbium</source>
-        <translation>鉺</translation>
+        <translation type="unfinished">鉺</translation>
     </message>
     <message>
         <source>Thulium</source>
-        <translation>銩</translation>
+        <translation type="unfinished">銩</translation>
     </message>
     <message>
         <source>Ytterbium</source>
-        <translation>鐿</translation>
+        <translation type="unfinished">鐿</translation>
     </message>
     <message>
         <source>Lutetium</source>
-        <translation>鎦</translation>
+        <translation type="unfinished">鎦</translation>
     </message>
     <message>
         <source>Hafnium</source>
-        <translation>鉿</translation>
+        <translation type="unfinished">鉿</translation>
     </message>
     <message>
         <source>Tantalum</source>
-        <translation>鉭</translation>
+        <translation type="unfinished">鉭</translation>
     </message>
     <message>
         <source>Tungsten</source>
-        <translation>鎢</translation>
+        <translation type="unfinished">鎢</translation>
     </message>
     <message>
         <source>Rhenium</source>
-        <translation>錸</translation>
+        <translation type="unfinished">錸</translation>
     </message>
     <message>
         <source>Osmium</source>
-        <translation>鋨</translation>
+        <translation type="unfinished">鋨</translation>
     </message>
     <message>
         <source>Iridium</source>
-        <translation>銥</translation>
+        <translation type="unfinished">銥</translation>
     </message>
     <message>
         <source>Platinum</source>
-        <translation>鉑</translation>
+        <translation type="unfinished">鉑</translation>
     </message>
     <message>
         <source>Gold</source>
-        <translation>金</translation>
+        <translation type="unfinished">金</translation>
     </message>
     <message>
         <source>Mercury</source>
-        <translation>汞</translation>
+        <translation type="unfinished">汞</translation>
     </message>
     <message>
         <source>Thallium</source>
-        <translation>鉈</translation>
+        <translation type="unfinished">鉈</translation>
     </message>
     <message>
         <source>Lead</source>
-        <translation>鉛</translation>
+        <translation type="unfinished">鉛</translation>
     </message>
     <message>
         <source>Bismuth</source>
-        <translation>鉍</translation>
+        <translation type="unfinished">鉍</translation>
     </message>
     <message>
         <source>Polonium</source>
-        <translation>釙</translation>
+        <translation type="unfinished">釙</translation>
     </message>
     <message>
         <source>Astatine</source>
-        <translation>厄</translation>
+        <translation type="unfinished">厄</translation>
     </message>
     <message>
         <source>Radon</source>
-        <translation>氡</translation>
+        <translation type="unfinished">氡</translation>
     </message>
     <message>
         <source>Francium</source>
-        <translation>鈁</translation>
+        <translation type="unfinished">鈁</translation>
     </message>
     <message>
         <source>Radium</source>
-        <translation>鐳</translation>
+        <translation type="unfinished">鐳</translation>
     </message>
     <message>
         <source>Actinium</source>
-        <translation>錒</translation>
+        <translation type="unfinished">錒</translation>
     </message>
     <message>
         <source>Thorium</source>
-        <translation>釷</translation>
+        <translation type="unfinished">釷</translation>
     </message>
     <message>
         <source>Protactinium</source>
-        <translation>鏷</translation>
+        <translation type="unfinished">鏷</translation>
     </message>
     <message>
         <source>Uranium</source>
-        <translation>鈾</translation>
+        <translation type="unfinished">鈾</translation>
     </message>
     <message>
         <source>Neptunium</source>
-        <translation>錼</translation>
+        <translation type="unfinished">錼</translation>
     </message>
     <message>
         <source>Plutonium</source>
-        <translation>鈽</translation>
+        <translation type="unfinished">鈽</translation>
     </message>
     <message>
         <source>Americium</source>
-        <translation>鋂</translation>
+        <translation type="unfinished">鋂</translation>
     </message>
     <message>
         <source>Curium</source>
-        <translation>鋦</translation>
+        <translation type="unfinished">鋦</translation>
     </message>
     <message>
         <source>Berkelium</source>
-        <translation>(金北)</translation>
+        <translation type="unfinished">(金北)</translation>
     </message>
     <message>
         <source>Californium</source>
-        <translation>鉲</translation>
+        <translation type="unfinished">鉲</translation>
     </message>
     <message>
         <source>Einsteinium</source>
-        <translation>鑀</translation>
+        <translation type="unfinished">鑀</translation>
     </message>
     <message>
         <source>Fermium</source>
-        <translation>鐨</translation>
+        <translation type="unfinished">鐨</translation>
     </message>
     <message>
         <source>Mendelevium</source>
-        <translation>鍆</translation>
+        <translation type="unfinished">鍆</translation>
     </message>
     <message>
         <source>Nobelium</source>
-        <translation>(金若)</translation>
+        <translation type="unfinished">(金若)</translation>
     </message>
     <message>
         <source>Lawrencium</source>
-        <translation>鐒</translation>
+        <translation type="unfinished">鐒</translation>
     </message>
     <message>
         <source>Rutherfordium</source>
-        <translation>鑪</translation>
+        <translation type="unfinished">鑪</translation>
     </message>
     <message>
         <source>Dubnium</source>
-        <translation>(金杜)</translation>
+        <translation type="unfinished">(金杜)</translation>
     </message>
     <message>
         <source>Seaborgium</source>
-        <translation>(金喜)</translation>
+        <translation type="unfinished">(金喜)</translation>
     </message>
     <message>
         <source>Bohrium</source>
-        <translation>(金波)</translation>
+        <translation type="unfinished">(金波)</translation>
     </message>
     <message>
         <source>Hassium</source>
-        <translation>(金黑)</translation>
+        <translation type="unfinished">(金黑)</translation>
     </message>
     <message>
         <source>Meitnerium</source>
-        <translation>(金麥)</translation>
+        <translation type="unfinished">(金麥)</translation>
+    </message>
+</context>
+<context>
+    <name>PSEWidget</name>
+    <message>
+        <source>Periodic System</source>
+        <translation>週期系統</translation>
+    </message>
+</context>
+<context>
+    <name>calcDlgUI</name>
+    <message>
+        <source>ERROR: 
+</source>
+        <translation>錯誤: 
+</translation>
+    </message>
+</context>
+<context>
+    <name>dataWidgetUI</name>
+    <message>
+        <source>Chemical Data</source>
+        <translation>Chemical Data</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/parashoot.ts b/i18n/zh_TW/parashoot.ts
index 96dba92..3dc00b7 100644
--- a/i18n/zh_TW/parashoot.ts
+++ b/i18n/zh_TW/parashoot.ts
@@ -1,27 +1,27 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>ParaShoot</name>
     <message>
         <source>ParaShoot</source>
-        <translation >ParaShoot</translation>
+        <translation>ParaShoot</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation >新遊戲</translation>
+        <translation>新遊戲</translation>
     </message>
     <message>
         <source>     Level: %1       Score: %2   </source>
-        <translation >     等級: %1       分數: %2   </translation>
+        <translation>     等級: %1       分數: %2   </translation>
     </message>
     <message>
         <source>       GAME OVER!
        Your Score:  %1
  Parachuters Killed: %2
         Accuracy: %3% </source>
         <translation>       GAME OVER!
        得分:  %1
  Parachuters Killed: %2
         Accuracy: %3% </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/patience.ts b/i18n/zh_TW/patience.ts
index c7c5348..9137dc9 100644
--- a/i18n/zh_TW/patience.ts
+++ b/i18n/zh_TW/patience.ts
@@ -1,73 +1,97 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CanvasCardWindow</name>
     <message>
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;遊戲</translation>
     </message>
     <message>
         <source>&amp;Change Card Backs</source>
-        <translation>&amp;改變花色</translation>
+        <translation type="obsolete">&amp;改變花色</translation>
     </message>
     <message>
         <source>&amp;Snap To Position</source>
-        <translation>&amp;自動定位</translation>
+        <translation type="obsolete">&amp;自動定位</translation>
     </message>
     <message>
         <source>&amp;Settings</source>
         <translation>&amp;設定</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;關於</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;說明</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>Change Card Backs</source>
-        <translation>改變花色</translation>
+        <translation type="obsolete">改變花色</translation>
     </message>
     <message>
         <source>Snap To Position</source>
-        <translation>自動定位</translation>
+        <translation type="obsolete">自動定位</translation>
     </message>
     <message>
         <source>Turn One Card</source>
-        <translation>翻一張牌</translation>
+        <translation type="obsolete">翻一張牌</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
         <source>Turn Three Cards</source>
-        <translation>翻三張牌</translation>
+        <translation type="obsolete">翻三張牌</translation>
     </message>
     <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
+    <message>
+        <source>&amp;Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change card backs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Snap to position</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn one card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Turn three cards</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qasteroids.ts b/i18n/zh_TW/qasteroids.ts
index d100e92..4ca6731 100644
--- a/i18n/zh_TW/qasteroids.ts
+++ b/i18n/zh_TW/qasteroids.ts
@@ -1,41 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KAstTopLevel</name>
     <message>
         <source>Asteroids</source>
         <translation>行星</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation >來源</translation>
+        <translation>來源</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation >等級</translation>
+        <translation>等級</translation>
     </message>
     <message>
         <source>Ships</source>
         <translation>太空梭</translation>
     </message>
     <message>
         <source>Fuel</source>
-        <translation >燃料</translation>
+        <translation>燃料</translation>
     </message>
     <message>
         <source>Press Calendar to start playing</source>
-        <translation >請按下Calender(行事曆) 以開始遊戲</translation>
+        <translation>請按下Calender(行事曆) 以開始遊戲</translation>
     </message>
     <message>
         <source>Ship Destroyed.
 Press Contacts/Home key.</source>
-        <translation >殘念~
+        <translation>殘念~
 請按下 Contacts/Home key</translation>
     </message>
     <message>
         <source>Game Over.
 Press Calendar for a new game.</source>
-        <translation >Game Over
+        <translation>Game Over
 請按下Calender(行事曆) 以開始新遊戲</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpdf.ts b/i18n/zh_TW/qpdf.ts
index f24ef81..b8dc415 100644
--- a/i18n/zh_TW/qpdf.ts
+++ b/i18n/zh_TW/qpdf.ts
@@ -1,101 +1,105 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QPdfDlg</name>
     <message>
         <source>QPdf</source>
         <translation>QPdf</translation>
     </message>
     <message>
         <source>Zoom</source>
         <translation>縮放</translation>
     </message>
     <message>
         <source>Fit to width</source>
         <translation>調至頁寬</translation>
     </message>
     <message>
         <source>Fit to page</source>
         <translation>調至頁面大小</translation>
     </message>
     <message>
         <source>50%</source>
         <translation>50%</translation>
     </message>
     <message>
         <source>75%</source>
         <translation>75%</translation>
     </message>
     <message>
         <source>100%</source>
         <translation>100%</translation>
     </message>
     <message>
         <source>125%</source>
         <translation>125%</translation>
     </message>
     <message>
         <source>150%</source>
         <translation>150%</translation>
     </message>
     <message>
         <source>200%</source>
         <translation>200%</translation>
     </message>
     <message>
         <source>Open...</source>
         <translation>開啟...</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>搜尋...</translation>
     </message>
     <message>
         <source>Fullscreen</source>
         <translation>全螢幕</translation>
     </message>
     <message>
         <source>First page</source>
         <translation>第一頁</translation>
     </message>
     <message>
         <source>Previous page</source>
         <translation>前一頁</translation>
     </message>
     <message>
         <source>Goto page...</source>
         <translation>跳至...</translation>
     </message>
     <message>
         <source>Next page</source>
         <translation>下一頁</translation>
     </message>
     <message>
         <source>Last page</source>
         <translation>最末頁</translation>
     </message>
     <message>
         <source>Next</source>
         <translation>下一個</translation>
     </message>
     <message>
         <source>Goto page</source>
         <translation>跳至頁</translation>
     </message>
     <message>
         <source>Select from 1 .. %1:</source>
         <translation></translation>
     </message>
     <message>
         <source>&apos;%1&apos; could not be found.</source>
         <translation>找不到&apos;%1&apos; </translation>
     </message>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>File does not exist !</source>
-        <translation>檔案不存在！</translation>
+        <translation type="obsolete">檔案不存在！</translation>
+    </message>
+    <message>
+        <source>File does not exist!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 5ee0e1e..fa55075 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,248 +1,256 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
         <translation>應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
         <translation>文件</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>列表瀏覽</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
         <translation>低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
         <translation>低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation >低電量警告.
+        <translation>低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>business card </translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>訊息</translation>
+        <translation type="unfinished">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+        <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
-    <name>DesktopPowerAlerter</name>
-    <message>
-        <source>Battery Status</source>
-        <translation >電池狀態</translation>
-    </message>
-</context>
-<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
+    <message>
+        <source>Finding documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching documents</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation>%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation>所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>文件瀏覽</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation>中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation >A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation >音效</translation>
+        <translation>音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation>圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>影像</translation>
     </message>
     <message>
         <source>All</source>
         <translation>所有</translation>
     </message>
     <message>
         <source>Link apps</source>
         <translation>連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation >Limit search to dir: (not used yet)</translation>
+        <translation>Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
         <translation>你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation>不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">電池狀態</translation>
+    </message>
+</context>
+<context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>關機</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>同步連結</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
         <translation>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>淮許</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation>同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation>&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;取消</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/reader.ts b/i18n/zh_TW/reader.ts
index 4d4c3e0..9e87aae 100644
--- a/i18n/zh_TW/reader.ts
+++ b/i18n/zh_TW/reader.ts
@@ -1,308 +1,785 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QTReaderApp</name>
+    <name>CBarPrefs</name>
     <message>
-        <source>Open</source>
-        <translation>開啟</translation>
+        <source>Toolbar Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation>關閉</translation>
+        <source>File</source>
+        <translation type="unfinished">檔案</translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation>資訊</translation>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Marks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indicators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Policy</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CButtonPrefs</name>
+    <message>
+        <source>Scroll Speed</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On Action...</source>
-        <translation>On Action...</translation>
+        <source>&lt;Nothing&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open File</source>
-        <translation>開啟檔案</translation>
+        <source>Open file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Autoscroll</source>
-        <translation>自動Scroll</translation>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mark</source>
-        <translation>Mark</translation>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation>全瑩幕</translation>
+        <translation type="unfinished">全瑩幕</translation>
     </message>
     <message>
-        <source>Navigation</source>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scroll</source>
-        <translation>Scroll</translation>
+        <source>Zoom out</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Jump</source>
-        <translation>跳</translation>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Page/Line Scroll</source>
+        <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Overlap</source>
+        <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use Cursor</source>
-        <translation>使用游標</translation>
+        <source>Page up</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set Dictionary</source>
-        <translation>設定字典</translation>
+        <source>Page down</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Two/One Touch</source>
+        <source>Line up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Target</source>
-        <translation>目標</translation>
+        <source>Line down</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Annotation</source>
+        <source>Beginning</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dictionary</source>
+        <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clipboard</source>
+        <source>Escape Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Up</source>
-        <translation type="unfinished">上</translation>
+        <source>Space Button</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Down</source>
-        <translation type="unfinished">下</translation>
+        <source>Return Button</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find...</source>
-        <translation>尋找...</translation>
+        <source>Left Arrow</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Continuous</source>
-        <translation>繼續</translation>
+        <source>Right Arrow</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Markup</source>
+        <source>Down Arrow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
-        <translation>自動</translation>
+        <source>Up Arrow</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CCloseDialog</name>
     <message>
-        <source>None</source>
+        <source>Tidy-up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>文字</translation>
+        <source>Delete</source>
+        <translation type="unfinished">刪除</translation>
     </message>
     <message>
-        <source>HTML</source>
+        <source>Delete Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Peanut/PML</source>
+        <source>Delete Configuration</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CFileBarPrefs</name>
     <message>
-        <source>Layout</source>
+        <source>Open</source>
+        <translation type="unfinished">開啟</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished">關閉</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation type="unfinished">資訊</translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CIndBarPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CInterPrefs</name>
+    <message>
+        <source>International</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideograms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram Width</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply font
+to dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Encoding</source>
+        <translation type="unfinished">編碼</translation>
+    </message>
+    <message>
+        <source>Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One
+Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swap Tap
+Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CLayoutPrefs</name>
+    <message>
         <source>Strip CR</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dehyphen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unindent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re-paragraph</source>
+        <source>Reparagraph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Double Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent+</source>
+        <source>Remap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Indent-</source>
+        <source>Embolden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repalm</source>
+        <source>Full Justify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remap</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CLayoutPrefs2</name>
     <message>
-        <source>Embolden</source>
+        <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zoom In</source>
-        <translation>放大</translation>
+        <source>Page
+Overlap</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Zoom Out</source>
-        <translation>縮小</translation>
+        <source>Graphics
+Zoom</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ideogram/Word</source>
+        <source>Margin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set width</source>
+        <source>Paragraph
+Leading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Encoding</source>
-        <translation>編碼</translation>
+        <source>Line
+Leading</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Markup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMarkBarPrefs</name>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">刪除</translation>
+    </message>
+    <message>
+        <source>Autogen</source>
+        <translation type="unfinished">自動產生</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">清除</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tidy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscBarPrefs</name>
+    <message>
+        <source>Floating</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Single bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Menu/tool bar</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Multiple bars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimised</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Movable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CMiscPrefs</name>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ascii</source>
+        <source>Dictionary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Depluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dejpluck</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continuous</source>
+        <translation type="unfinished">繼續</translation>
+    </message>
+    <message>
+        <source>Select Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plucker</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CNavBarPrefs</name>
+    <message>
+        <source>Scroll</source>
+        <translation type="unfinished">Scroll</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Page Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation type="unfinished">跳</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CPrefs</name>
+    <message>
+        <source>OpieReader Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Layout(2)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Locale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>UTF-8</source>
+        <source>Buttons</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CURLDialog</name>
     <message>
-        <source>UCS-2(BE)</source>
+        <source>Save URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>USC-2(LE)</source>
+        <source>Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Palm</source>
+        <source>Local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Windows(1252)</source>
+        <source>Global file</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CViewBarPrefs</name>
+    <message>
+        <source>Fullscreen</source>
+        <translation type="unfinished">全瑩幕</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation type="unfinished">放大</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation type="unfinished">縮小</translation>
+    </message>
+    <message>
+        <source>Set Font</source>
+        <translation type="unfinished">設定字型</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation type="unfinished">編碼</translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QTReaderApp</name>
+    <message>
+        <source>Open</source>
+        <translation>開啟</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <source>Info</source>
+        <translation>資訊</translation>
+    </message>
+    <message>
+        <source>Fullscreen</source>
+        <translation>全瑩幕</translation>
+    </message>
+    <message>
+        <source>Navigation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scroll</source>
+        <translation>Scroll</translation>
+    </message>
+    <message>
+        <source>Jump</source>
+        <translation>跳</translation>
+    </message>
+    <message>
+        <source>Page/Line Scroll</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Two/One Touch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Annotation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Up</source>
+        <translation type="unfinished">上</translation>
+    </message>
+    <message>
+        <source>Down</source>
+        <translation type="unfinished">下</translation>
+    </message>
+    <message>
+        <source>Find...</source>
+        <translation>尋找...</translation>
+    </message>
+    <message>
+        <source>Zoom In</source>
+        <translation>放大</translation>
+    </message>
+    <message>
+        <source>Zoom Out</source>
+        <translation>縮小</translation>
+    </message>
     <message>
         <source>Set Font</source>
         <translation>設定字型</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation>自動產生</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
-        <source>Format</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Marks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configuration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Load Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toolbars</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run Script</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export Links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto Start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Goto End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scrolling</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Target</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pause Paras</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ideogram</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reader</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished">大小</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 98d859b..6d1b8df 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -1,102 +1,118 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>設定通行碼</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>通行碼不正確</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>輸入的通行碼不正確.
 存取已拒絕</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>重新輸入新的通行碼</translation>
     </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
         <translation>192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
         <translation>172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
         <translation>10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
         <translation>192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
         <translation>192.168.1.0/24</translation>
     </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sheetqt.ts b/i18n/zh_TW/sheetqt.ts
index c8869a0..f816893 100644
--- a/i18n/zh_TW/sheetqt.ts
+++ b/i18n/zh_TW/sheetqt.ts
@@ -1,825 +1,797 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
         <translation>框線(&amp;B)</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
         <translation>背景(&amp;G)</translation>
     </message>
     <message>
         <source>&amp;Font</source>
         <translation>字型(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
         <translation>對齊方式(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
         <translation>寬度(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
         <translation>顏色(&amp;C):</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
         <translation>預設框線(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
         <translation>樣式(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
         <translation>預設背景(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
         <translation>字型(&amp;F):</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
         <translation>大小(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
         <translation>粗體(&amp;B)</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
         <translation>斜體(&amp;I)</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
         <translation>預設字型(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
         <translation>垂直(&amp;V):</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
         <translation>水平(&amp;H):</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
         <translation>文字換行(&amp;W)</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
         <translation>預設對齊方式(&amp;D)</translation>
     </message>
     <message>
         <source>Format Cells</source>
         <translation>格式化儲存格</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie 試算表</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>選項(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
         <translation>搜尋目標(&amp;S):</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
         <translation>取代為(&amp;R):</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>類型(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
         <translation>尋找(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
         <translation>取代(&amp;R)</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
         <translation>全部取代(&amp;A)</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
         <translation>區分大小寫(&amp;C)</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
         <translation>只有目前的選擇區(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
         <translation>整個儲存格(&amp;E)</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
         <translation>尋找 &amp; 取代</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie 試算表</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation>不一致的錯誤!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation>不能儲存檔案!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation>不能開啟檔案!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
         <translation>無效的檔案格式!</translation>
     </message>
     <message>
         <source>Save File</source>
         <translation>儲存檔案</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
         <translation>您要儲存目前的檔案嗎?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
         <translation>檔案名稱(&amp;F):</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
         <translation>未命名的檔案</translation>
     </message>
     <message>
         <source>New File</source>
         <translation>新增檔案</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>新增(&amp;N)</translation>
     </message>
     <message>
         <source>Open File</source>
         <translation>開啟檔案</translation>
     </message>
     <message>
         <source>&amp;Open</source>
         <translation>開啟(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Save</source>
         <translation>儲存(&amp;S)</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>另存新檔</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>另存新檔(&amp;A)</translation>
     </message>
     <message>
-        <source>Quit</source>
-        <translation>離開</translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation>離開(&amp;Q)</translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation>一般說明</translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation>一般(&amp;G)</translation>
-    </message>
-    <message>
         <source>About Opie Sheet</source>
         <translation>關於 Opie 試算表</translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation>關於(&amp;A)</translation>
-    </message>
-    <message>
         <source>Accept</source>
         <translation>接受</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>接受(&amp;A)</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>取消(&amp;C)</translation>
     </message>
     <message>
         <source>Cell Selector</source>
         <translation>儲存格選擇器</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
         <translation>儲存格選擇器(&amp;S)</translation>
     </message>
     <message>
         <source>Cut Cells</source>
         <translation>剪下儲存格</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
         <translation>剪下(&amp;T)</translation>
     </message>
     <message>
         <source>Copy Cells</source>
         <translation>複製儲存格</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
         <translation>複製(&amp;C)</translation>
     </message>
     <message>
         <source>Paste Cells</source>
         <translation>貼上儲存格</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>貼上(&amp;P)</translation>
     </message>
     <message>
         <source>Paste Contents</source>
         <translation>貼上內容</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
         <translation>貼上內容(&amp;E)</translation>
     </message>
     <message>
         <source>Clear Cells</source>
         <translation>清除儲存格</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
         <translation>清除(&amp;L)</translation>
     </message>
     <message>
         <source>Insert Cells</source>
         <translation>插入儲存格</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
         <translation>儲存格(&amp;E)</translation>
     </message>
     <message>
         <source>Insert Rows</source>
         <translation>插入列</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
         <translation>列(&amp;R)</translation>
     </message>
     <message>
         <source>Insert Columns</source>
         <translation>插入欄</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
         <translation>欄(&amp;C)</translation>
     </message>
     <message>
         <source>Add Sheets</source>
         <translation>加入工作表</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
         <translation>工作表(&amp;S)</translation>
     </message>
     <message>
         <source>Cells</source>
         <translation>儲存格</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
         <translation>儲存格(&amp;C)</translation>
     </message>
     <message>
         <source>Row Height</source>
         <translation>列高</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
         <translation>高度(&amp;E)</translation>
     </message>
     <message>
         <source>Adjust Row</source>
         <translation>調整列</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
         <translation>調整(&amp;A)</translation>
     </message>
     <message>
         <source>Show Row</source>
         <translation>顯示列</translation>
     </message>
     <message>
         <source>&amp;Show</source>
         <translation>顯示(&amp;S)</translation>
     </message>
     <message>
         <source>Hide Row</source>
         <translation>隱藏列</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
         <translation>隱藏(&amp;H)</translation>
     </message>
     <message>
         <source>Column Width</source>
         <translation>欄寬</translation>
     </message>
     <message>
         <source>&amp;Width</source>
         <translation>寬度(&amp;W)</translation>
     </message>
     <message>
         <source>Adjust Column</source>
         <translation>調整欄</translation>
     </message>
     <message>
         <source>Show Column</source>
         <translation>顯示欄</translation>
     </message>
     <message>
         <source>Hide Column</source>
         <translation>隱藏欄</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
         <translation>重新命名工作表</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
         <translation>重新命名(&amp;R)</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
         <translation>移除工作表</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation>移除(&amp;E)</translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation>排序資料</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
         <translation>排序(&amp;S)</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
         <translation>尋找 &amp;&amp; 取代(&amp;F)</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation>等同於</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation>等同於(&amp;E)</translation>
     </message>
     <message>
         <source>Addition</source>
         <translation>加</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
         <translation>加(&amp;A)</translation>
     </message>
     <message>
         <source>Subtraction</source>
         <translation>減</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
         <translation>減(&amp;S)</translation>
     </message>
     <message>
         <source>Multiplication</source>
         <translation>乘</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
         <translation>乘(&amp;M)</translation>
     </message>
     <message>
         <source>Division</source>
         <translation>除</translation>
     </message>
     <message>
         <source>&amp;Division</source>
         <translation>除(&amp;D)</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
         <translation>開啟 ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
         <translation>開啟 Paranthesis(&amp;O)</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
         <translation>關閉 Paranthesis</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
         <translation>關閉 Paranthesis(&amp;C)</translation>
     </message>
     <message>
         <source>Comma</source>
         <translation>逗號</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
         <translation>逗號(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>編輯(&amp;E)</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
         <translation>插入(&amp;I)</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>格式(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>資料(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>說明(&amp;H)</translation>
-    </message>
-    <message>
         <source>&amp;Row</source>
         <translation>列(&amp;R)</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation>欄(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>工作表(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>函數(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
         <translation>標準(&amp;S)</translation>
     </message>
     <message>
         <source>Summation</source>
         <translation>總和</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
         <translation>總和(&amp;S)</translation>
     </message>
     <message>
         <source>Absolute Value</source>
         <translation>絕對值</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
         <translation>絕對值(&amp;A)</translation>
     </message>
     <message>
         <source>Sine</source>
         <translation>正弦</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
         <translation>正弦(&amp;N)</translation>
     </message>
     <message>
         <source>Arc Sine</source>
         <translation>反正弦</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
         <translation>反正弦(&amp;R)</translation>
     </message>
     <message>
         <source>Cosine</source>
         <translation>餘弦</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
         <translation>餘弦(&amp;C)</translation>
     </message>
     <message>
         <source>ArcCosine</source>
         <translation>反餘弦</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
         <translation>反餘弦(&amp;I)</translation>
     </message>
     <message>
         <source>Tangent</source>
         <translation>正切</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
         <translation>正切(&amp;T)</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
         <translation>反正切</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
         <translation>反正切(&amp;G)</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
         <translation>座標的反正切</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
         <translation>座標的反正切(&amp;O)</translation>
     </message>
     <message>
         <source>Exponential</source>
         <translation>指數</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
         <translation>指數(&amp;E)</translation>
     </message>
     <message>
         <source>Logarithm</source>
         <translation>對數</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
         <translation>對數(&amp;L)</translation>
     </message>
     <message>
         <source>Power</source>
         <translation>乘冪</translation>
     </message>
     <message>
         <source>&amp;Power</source>
         <translation>乘冪(&amp;P)</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
         <translation>數學的(&amp;M)</translation>
     </message>
     <message>
         <source>Average</source>
         <translation>平均數</translation>
     </message>
     <message>
         <source>&amp;Average</source>
         <translation>平均數(&amp;A)</translation>
     </message>
     <message>
         <source>Maximum</source>
         <translation>最大值</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
         <translation>最大值(&amp;X)</translation>
     </message>
     <message>
         <source>Minimum</source>
         <translation>最小值</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
         <translation>最小值(&amp;M)</translation>
     </message>
     <message>
         <source>Count</source>
         <translation>計數</translation>
     </message>
     <message>
         <source>&amp;Count</source>
         <translation>計數(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
         <translation>統計(&amp;S)</translation>
     </message>
     <message>
         <source>Functions</source>
         <translation>函數</translation>
     </message>
     <message>
-        <source>Help file not found!</source>
-        <translation>找不到說明檔!</translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation>列數(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>欄數(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>工作表數量(&amp;N):</translation>
     </message>
     <message>
         <source>Sheet</source>
         <translation>工作表</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
         <translation>每列的高度(&amp;H):</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
         <translation>每欄的寬度(&amp;W):</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
         <translation>工作表名稱(&amp;S):</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation>這裡只有一個工作表!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation>您確定嗎?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
         <translation>類型(&amp;T)</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation>儲存格下移(&amp;D):</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation>儲存格右移(&amp;R)</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation>整列(&amp;W)</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
         <translation>整欄(&amp;C)</translation>
     </message>
     <message>
         <source>Opie Sheet
 Spreadsheet Software for Opie
 QWDC Beta Winner (as Sheet/Qt)
 
 Developed by: Serdar Ozler
 Release 1.0.2
 Release Date: October 08, 2002
 
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
         <translation>Opie 試算表
 Opie 的試算表軟體
 QWDC Beta Winner (以 Sheet/Qt)
 
 開發者: Serdar Ozler
 釋出版本 1.0.2
 釋出日期: 十月 08, 2002
 
 這個產品是依 GPL 授權. 它可以自由地散佈. 如果您想要取得最新的版本和原始碼, 請參觀下列網站.
 
 http://qtopia.sitebest.com</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>Syntax error!</source>
         <translation>語法錯誤!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
         <translation>找不到搜尋的目標!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>排序(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Options</source>
         <translation>選項(&amp;O)</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
         <translation>排序依(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
         <translation>接著依(&amp;T)</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
         <translation>然後依(&amp;B)</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
         <translation>區分大小寫(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
         <translation>方向(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
         <translation>頂端到底部(列)(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
         <translation>左邊到右邊(欄)(&amp;L)</translation>
     </message>
     <message>
         <source>Sort</source>
         <translation>排序</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
         <translation>遞增(&amp;A)</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
         <translation>遞減(&amp;D)</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
         <translation>只有一個儲存格時不能排序!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/snake.ts b/i18n/zh_TW/snake.ts
index ec9dff7..71f7d83 100644
--- a/i18n/zh_TW/snake.ts
+++ b/i18n/zh_TW/snake.ts
@@ -1,42 +1,50 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>貪食蛇</translation>
     </message>
     <message>
         <source>New Game</source>
-        <translation >新遊戲</translation>
+        <translation>新遊戲</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>貪食蛇!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>使用方向鍵以控制蛇去吃老鼠
 不能碰到牆.蛋或是他的尾巴</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
-        <translation>按任意鍵以開始</translation>
+        <translation type="obsolete">按任意鍵以開始</translation>
     </message>
     <message>
         <source>     Score :    %1   </source>
         <translation>     分數 :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
  你的得分: %1</translation>
     </message>
     <message>
         <source>Press Any Key to Begin a New Game.</source>
-        <translation >按任意鍵以開始新遊戲</translation>
+        <translation type="obsolete">按任意鍵以開始新遊戲</translation>
+    </message>
+    <message>
+        <source>Press any key to start</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Press any key to begin a new game.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/stockticker.ts b/i18n/zh_TW/stockticker.ts
new file mode 100644
index 0000000..53c65ee
--- a/dev/null
+++ b/i18n/zh_TW/stockticker.ts
@@ -0,0 +1,68 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>HelpWindow</name>
+    <message>
+        <source>&amp;Open File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Go</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Backward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputDialog</name>
+    <message>
+        <source>Symbol Lookup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter something to lookup / search.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index eebb241..97b71e0 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -1,312 +1,296 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished">CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished">本圖表顯示CF記憶卡上已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished">Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished">本圖表顯示硬碟上已使用的儲存空間</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished">SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished">本圖表顯示SD記憶卡上已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished">SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished">In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished">本圖表顯示內建記憶體中已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished">RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished">本圖表顯示RAM disk上已使用的記憶體量</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>應用程式CPU使用率 (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>系統CPU使用率</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>型號</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>本頁顯示處理器資源消耗程度</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>緩衝區 (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>快取區 (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>剩餘 (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>本頁顯示裝置些記憶體分配情形
 記憶體使用分類如下：
 
 1. 已使用 - 由Opie及執行的程式所佔用
 2. 緩衝區 - 用來提升系統效能的暫存區
 3. 快取區 - 最近使用過但尚未清除的資訊
 4. 剩餘 - 未被Opie或任何執行程式佔用的記憶體</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>使用者</translation>
+        <translation type="obsolete">使用者</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>從選單中選擇指令，再點右側的「送出」鈕即可送出命令給選取的模組</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>點下此處即可送出命令給上方已選取的模組</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>您確定要執行？</translation>
+        <translation type="obsolete">您確定要執行？</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation>尚餘 (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 Kb</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>命令</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>這是裝置上所有執行中程序的清單
 
 點住程序名稱不放即可顯示詳細資訊或送訊號給它</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>由選單中選擇一個訊號，並點下右側的「送出」鈕，即可送訊號給該程序</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>點此處以送出選定的訊號給選取的程序</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>本區顯示選取程序的詳細資料</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>您確定要送出？</translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>CF卡：</translation>
+        <translation type="obsolete">您確定要送出？</translation>
     </message>
     <message>
-        <source>Hard Disk </source>
-        <translation>硬碟：</translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>SD卡：</translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>硬碟 /dev/hd：</translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>SCSI硬碟 /dev/sd：</translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>內部儲存空間：</translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>本圖表顯示CF記憶卡上已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>本圖表顯示硬碟上已使用的儲存空間</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>本圖表顯示SD記憶卡上已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>In</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>本圖表顯示內建記憶體中已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>RAM disk</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>本圖表顯示RAM disk上已使用的記憶體量</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>系統資訊</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>記憶體</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>儲存空間</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>中央處理器</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>程序</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>模組</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux 核心&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>編譯者：</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>建立日期</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
         <translation>&lt;p&gt;型號: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
         <translation>&lt;p&gt;提供者: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>本頁顯示本裝置上執行的Opie, Linux核心版及發行套件名稱</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/systemtime.ts b/i18n/zh_TW/systemtime.ts
index 0bb3b23..4179978 100644
--- a/i18n/zh_TW/systemtime.ts
+++ b/i18n/zh_TW/systemtime.ts
@@ -1,284 +1,242 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Ntp</name>
+    <name>FormatTabWidget</name>
     <message>
-        <source>time.fu-berlin.de</source>
-        <translation>time.fu-berlin.de</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation>執行 NTP?</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of </source>
-        <translation>您要求延遲 </translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation> 分鐘, 但是只有 </translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.</source>
-        <translation> 分鐘前進行過查詢.</translation>
-    </message>
-    <message>
-        <source>Rerun NTP?</source>
-        <translation>重新執行 NTP?</translation>
+        <source>Time format</source>
+        <translation type="unfinished">時間格式</translation>
     </message>
     <message>
-        <source>Running:</source>
-        <translation>執行中:</translation>
+        <source>hh:mm</source>
+        <translation type="unfinished">hh:mm</translation>
     </message>
     <message>
-        <source>Error while executing ntpdate</source>
-        <translation>在執行 ntpdate 時發生錯誤</translation>
+        <source>D/M hh:mm</source>
+        <translation type="unfinished">D/M hh:mm</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation> 秒</translation>
+        <source>M/D hh:mm</source>
+        <translation type="unfinished">M/D hh:mm</translation>
     </message>
     <message>
-        <source>last [h]</source>
-        <translation>上次 [h]</translation>
+        <source>12/24 hour</source>
+        <translation type="unfinished">12/24 小時制</translation>
     </message>
     <message>
-        <source>offset [s]</source>
-        <translation>誤差 [s]</translation>
+        <source>24 hour</source>
+        <translation type="unfinished">24 小時制</translation>
     </message>
     <message>
-        <source>shift [s/h]</source>
-        <translation>移位 [s/h]</translation>
+        <source>12 hour</source>
+        <translation type="unfinished">12 小時制</translation>
     </message>
     <message>
-        <source> s/h</source>
-        <translation> s/h</translation>
+        <source>Date format</source>
+        <translation type="unfinished">日期格式</translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation>從網路取得時刻</translation>
+        <source>Weeks start on</source>
+        <translation type="unfinished">一星期開始於</translation>
     </message>
     <message>
-        <source>Set predicted time: </source>
-        <translation>設定預報的時刻: </translation>
+        <source>Sunday</source>
+        <translation type="unfinished">星期日</translation>
     </message>
     <message>
-        <source>Could not connect to server </source>
-        <translation>無法連線到伺服器 </translation>
+        <source>Monday</source>
+        <translation type="unfinished">星期一</translation>
     </message>
+</context>
+<context>
+    <name>MainWindow</name>
     <message>
-        <source>Predict</source>
-        <translation>預報</translation>
+        <source>SystemTime</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP</source>
-        <translation>NTP</translation>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
-        <translation>主要</translation>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation>設定</translation>
+        <translation type="unfinished">設定</translation>
     </message>
     <message>
-        <source>ntp error</source>
-        <translation>ntp 錯誤</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation>從網路取得時刻時發生錯誤!</translation>
+        <source>Predict</source>
+        <translation type="unfinished">預報</translation>
     </message>
     <message>
-        <source>Error while getting time form
- server</source>
-        <translation>從伺服器取得時刻時
-發生錯誤</translation>
+        <source>Continue?</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>NtpBase</name>
     <message>
-        <source>Network Time</source>
-        <translation>網路時刻</translation>
+        <source>Running:
+ntpdate </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Get time from network</source>
-        <translation>從網路取得時刻</translation>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time:</source>
-        <translation>開始時刻:</translation>
+        <source>Error while getting time from network.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>nan</source>
-        <translation>nan</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation>時刻平移:</translation>
+        <source>Error while executing ntpdate</source>
+        <translation type="unfinished">在執行 ntpdate 時發生錯誤</translation>
     </message>
     <message>
-        <source>New Time:</source>
-        <translation>新的時刻:</translation>
+        <source>Time Server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Esimated Shift:</source>
-        <translation>估計平移:</translation>
+        <source>Error while getting time from
+ server: </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Predicted Time:</source>
-        <translation>預報的時刻:</translation>
+        <source>Could not connect to server </source>
+        <translation type="unfinished">無法連線到伺服器 </translation>
     </message>
     <message>
-        <source>Mean shift:</source>
-        <translation>平均平移:</translation>
+        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set predicted time</source>
-        <translation>設定預報時刻</translation>
+        <source>%1 seconds</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>NTPTabWidget</name>
     <message>
-        <source>Predict time</source>
-        <translation>預報時刻</translation>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use</source>
-        <translation>使用</translation>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>as</source>
-        <translation>當做</translation>
+        <source>Time shift</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation>NTP 伺服器以便自網路取得時刻</translation>
+        <source>New time</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wait for </source>
-        <translation>等候 </translation>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PredictTabWidget</name>
     <message>
-        <source>minutes until</source>
-        <translation>分鐘, 直到</translation>
+        <source>Predicted time drift</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation>NTP 嘗試讓時鐘與網路同步.</translation>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Insure a delay of</source>
-        <translation>確保延遲時間</translation>
+        <source>Estimated shift</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation>將使用新的 NTP 查詢來預報時刻.</translation>
+        <source>Predicted time</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set time</source>
-        <translation>設定時刻</translation>
+        <source>Shift [s/h]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Main</source>
-        <translation>主要</translation>
+        <source>Last [h]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Manual</source>
-        <translation>手動</translation>
+        <source>Offset [s]</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>設定</translation>
+        <source>Predict time</source>
+        <translation type="unfinished">預報時刻</translation>
     </message>
     <message>
-        <source>Predict</source>
-        <translation>預報</translation>
+        <source>Set predicted time</source>
+        <translation type="unfinished">設定預報時刻</translation>
     </message>
     <message>
-        <source>NTP</source>
-        <translation>NTP</translation>
+        <source> s/h</source>
+        <translation type="unfinished"> s/h</translation>
     </message>
     <message>
-        <source>Advanced settings</source>
-        <translation>進階設定</translation>
+        <source> seconds</source>
+        <translation type="unfinished"> 秒</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
+    <name>SettingsTabWidget</name>
     <message>
-        <source>Time Zone</source>
-        <translation>時區</translation>
+        <source>Time server</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date</source>
-        <translation>日期</translation>
+        <source>minutes between time updates</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Time format</source>
-        <translation>時間格式</translation>
+        <source>minutes between prediction updates</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>24 hour</source>
-        <translation>24 小時制</translation>
+        <source>Display time server information</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>12 hour</source>
-        <translation>12 小時制</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation>一星期開始於</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation>星期日</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation>星期一</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation>日期格式</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation>小程式格式</translation>
+        <source>Display time prediction information</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimeTabWidget</name>
     <message>
-        <source>hh:mm</source>
-        <translation>hh:mm</translation>
+        <source>Hour</source>
+        <translation type="unfinished">時</translation>
     </message>
     <message>
-        <source>D/M hh:mm</source>
-        <translation>D/M hh:mm</translation>
+        <source>Minute</source>
+        <translation type="unfinished">分</translation>
     </message>
     <message>
-        <source>M/D hh:mm</source>
-        <translation>M/D hh:mm</translation>
+        <source>AM</source>
+        <translation type="unfinished">AM</translation>
     </message>
     <message>
-        <source>System Time</source>
-        <translation>系統時間</translation>
+        <source>PM</source>
+        <translation type="unfinished">PM</translation>
     </message>
-</context>
-<context>
-    <name>SetTime</name>
     <message>
-        <source>Hour</source>
-        <translation>時</translation>
+        <source>Date</source>
+        <translation type="unfinished">日期</translation>
     </message>
     <message>
-        <source>Minute</source>
-        <translation>分</translation>
+        <source>Time zone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AM</source>
-        <translation>AM</translation>
+        <source>Get time from the network</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation>PM</translation>
+        <source>Set predicted time</source>
+        <translation type="unfinished">設定預報時刻</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/tetrix.ts b/i18n/zh_TW/tetrix.ts
index 4793873..a6c8cf8 100644
--- a/i18n/zh_TW/tetrix.ts
+++ b/i18n/zh_TW/tetrix.ts
@@ -1,29 +1,63 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>OHighscore</name>
+    <message>
+        <source>empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter your name!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OHighscoreDialog</name>
+    <message>
+        <source>Highscores</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>#</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Level</source>
+        <translation type="unfinished">等級</translation>
+    </message>
+</context>
+<context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
-        <translation >魔術方塊</translation>
+        <translation>魔術方塊</translation>
     </message>
     <message>
         <source>Next</source>
-        <translation >下一個</translation>
+        <translation>下一個</translation>
     </message>
     <message>
         <source>Score</source>
-        <translation >分數</translation>
+        <translation>分數</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation >等級</translation>
+        <translation>等級</translation>
     </message>
     <message>
         <source>Removed</source>
-        <translation >移除</translation>
+        <translation>移除</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation >開始</translation>
+        <translation>開始</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index c811e7f..5b7b74a 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -1,249 +1,274 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation>文字編輯</translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation>寫入錯誤</translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation>未名命</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation>文字編輯器</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>全部全部</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>文字</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation>權限</translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation>選擇字型</translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>是的</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>存檔</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>另存新檔</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>剪下</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>貼上</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>尋找...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>放大</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>縮小</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>折回行列</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>開始新的檔案</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>View</source>
         <translation>觀看</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>尋找下一個</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>尋找最近的</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>文字編輯器</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字形</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>.desktop File</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Linked Document</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>進階選項</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Prompt on Exit</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>總是開啟Linked檔案</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>檔案權限</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>開始Search Bar</translation>
     </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation type="unfinished">文字編輯</translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation type="unfinished">寫入錯誤</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation type="unfinished">未名命</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">權限</translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation type="unfinished">選擇字型</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
+        <translation type="obsolete">Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">是的</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">否</translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定檔案權限 :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>read</source>
         <translation>讀</translation>
     </message>
     <message>
         <source>write</source>
         <translation>寫</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>
         <source>Error- no user</source>
         <translation>錯誤 - no user</translation>
     </message>
     <message>
         <source>Error- no  group</source>
         <translation>錯誤 - no group</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
         <translation>錯誤 setting ownership or group</translation>
     </message>
     <message>
         <source>Error setting mode</source>
         <translation>錯誤  setting mode</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>檔案權限</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/tictac.ts b/i18n/zh_TW/tictac.ts
index 8d4cc55..01f0eb5 100644
--- a/i18n/zh_TW/tictac.ts
+++ b/i18n/zh_TW/tictac.ts
@@ -1,41 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>QObject</name>
+    <message>
+        <source>TicTac</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>電腦先下</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>玩家先下</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>開始!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>Click Play to start</source>
-        <translation>按"開始!"開始遊戲</translation>
+        <translation>按&quot;開始!&quot;開始遊戲</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>輪到你了</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>你贏了!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>電腦贏了!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>不分勝負</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/tinykate.ts b/i18n/zh_TW/tinykate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/zh_TW/tinykate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</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>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 22cdc5a..eedc3a5 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,119 +1,182 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
         <source>Owned by </source>
-        <translation>所有人</translation>
+        <translation type="unfinished">所有人</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>請填入個人名片資料</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>找不到plugins</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>plugins未啟動</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>按此處啟動聯結的應用程式</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Today By Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>按此處啟動設定對話視窗</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>「今日」個人設定</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>載入及順序設定</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>啟動/順序</translation>
     </message>
     <message>
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Resume後
+        <translation type="obsolete">Resume後
         自動啟動？
         (OPie only)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>休眠分鐘數</translation>
+        <translation type="obsolete">休眠分鐘數</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>打勾開啟喚醒時自動啟動「今日」功能</translation>
+        <translation type="obsolete">打勾開啟喚醒時自動啟動「今日」功能</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
+        <translation type="obsolete">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>圖示大小</translation>
+        <translation type="obsolete">圖示大小</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>設定圖示的像素點數</translation>
+        <translation type="obsolete">設定圖示的像素點數</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>更新內容</translation>
+        <translation type="obsolete">更新內容</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>「今日」多久自動更新一次內容</translation>
+        <translation type="obsolete">「今日」多久自動更新一次內容</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>秒</translation>
+        <translation type="obsolete">秒</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>永不</translation>
+        <translation type="obsolete">永不</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>勾選要啟動的plugins，並用右側的上下箭頭來調整顯示順序</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished">打勾開啟喚醒時自動啟動「今日」功能</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished">休眠分鐘數</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished">設定圖示的像素點數</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">秒</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished">永不</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished">「今日」多久自動更新一次內容</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 22ebf2a..3833e60 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,443 +1,585 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
-        <source>New Task</source>
-        <translation>新增待辦事項</translation>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OTaskEditor</name>
+    <message>
+        <source>Alarms</source>
+        <translation>鬧鈴</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recurrence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Task Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Enter Task</source>
+        <translation>輸入新的待辦事項</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>編輯待辦事項</translation>
     </message>
     <message>
+        <source>silent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>loud</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie Todolist</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QWidget</name>
+    <message>
+        <source>New from template</source>
+        <translation type="unfinished">利用樣板建立新事項</translation>
+    </message>
+    <message>
+        <source>New Task</source>
+        <translation type="unfinished">新增待辦事項</translation>
+    </message>
+    <message>
+        <source>Click here to create a new task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Task</source>
+        <translation type="unfinished">編輯待辦事項</translation>
+    </message>
+    <message>
+        <source>Click here to modify the current task.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>View Task</source>
-        <translation>檢視待辦事項</translation>
+        <translation type="unfinished">檢視待辦事項</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation>刪除...</translation>
+        <translation type="unfinished">刪除...</translation>
+    </message>
+    <message>
+        <source>Click here to remove the current task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation>刪除全部....</translation>
+        <translation type="unfinished">刪除全部....</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>刪除已完成事項</translation>
+        <translation type="unfinished">刪除已完成事項</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation>複製事項</translation>
+        <translation type="unfinished">複製事項</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>傳送資料</translation>
+        <translation type="unfinished">傳送資料</translation>
+    </message>
+    <message>
+        <source>Click here to send the current task to another device.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>搜尋</translation>
+        <translation type="unfinished">搜尋</translation>
     </message>
     <message>
-        <source>Completed tasks</source>
-        <translation>顯示已完成事項</translation>
+        <source>Show completed tasks</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show Deadline</source>
-        <translation>顯示到期日</translation>
+        <source>Show only over-due tasks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show task deadlines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show quick task bar</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data</source>
-        <translation>資料管理</translation>
+        <translation type="unfinished">資料管理</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>分類目錄</translation>
+        <translation type="unfinished">分類目錄</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation>設定選項</translation>
+        <translation type="unfinished">設定選項</translation>
     </message>
     <message>
-        <source>Show only over due</source>
-        <translation>只顯示已過期之待辦事項</translation>
+        <source>QuickEdit</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New from template</source>
-        <translation>利用樣板建立新事項</translation>
+        <source>This is a listing of all current tasks.
+
+The list displays the following information:
+1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
+2. Priority - a graphical representation of task priority.  Double-click here to modify.
+3. Description - description of task.  Click here to select the task.
+4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation>全部目錄</translation>
+        <translation type="unfinished">全部目錄</translation>
+    </message>
+    <message>
+        <source>Unfiled</source>
+        <translation type="unfinished">未分類的</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>空間不足</translation>
+        <translation type="unfinished">空間不足</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>您的變更無法被存入，請清理出更多可用空間。是否放棄變更並退出？</translation>
+        <translation type="unfinished">您的變更無法被存入，請清理出更多可用空間。是否放棄變更並退出？</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation>待辦事項</translation>
+        <translation type="unfinished">待辦事項</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>正在同步資料中，無法進行編輯</translation>
+        <translation type="obsolete">正在同步資料中，無法進行編輯</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation>所有的待辦事項？</translation>
+        <translation type="unfinished">所有的待辦事項？</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation>所有的已完成事項？</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation>未分類的</translation>
+        <translation type="unfinished">所有的已完成事項？</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation>&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
+        <translation type="unfinished">&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation>新增待辦事項</translation>
+        <translation type="unfinished">新增待辦事項</translation>
     </message>
-</context>
-<context>
-    <name>OTaskEditor</name>
     <message>
-        <source>Overview</source>
-        <translation>內容</translation>
+        <source>C.</source>
+        <translation type="unfinished">完成</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>進階設定</translation>
+        <source>Priority</source>
+        <translation type="unfinished">優先順序</translation>
     </message>
     <message>
-        <source>Alarms</source>
-        <translation>鬧鈴</translation>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation>提醒事項</translation>
+        <source>Deadline</source>
+        <translation type="unfinished">到期日</translation>
     </message>
     <message>
-        <source>X-Ref</source>
-        <translation>X-Ref</translation>
+        <source>Configure Templates</source>
+        <translation type="unfinished">樣板管理</translation>
     </message>
     <message>
-        <source>Recurrance</source>
-        <translation>週期性</translation>
+        <source>Template Editor</source>
+        <translation type="unfinished">樣板編輯器</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Enter Task</source>
-        <translation>輸入新的待辦事項</translation>
+        <source>Add</source>
+        <translation type="unfinished">新增</translation>
     </message>
     <message>
-        <source>Edit Task</source>
-        <translation>編輯待辦事項</translation>
+        <source>Edit</source>
+        <translation type="unfinished">編輯</translation>
     </message>
-</context>
-<context>
-    <name>TableView</name>
     <message>
-        <source>C.</source>
-        <translation>完成</translation>
+        <source>Remove</source>
+        <translation type="unfinished">移除</translation>
     </message>
     <message>
-        <source>Prior.</source>
-        <translation>優先順序</translation>
+        <source>Name</source>
+        <translation type="unfinished">命名</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation>說明</translation>
+        <source>New Template %1</source>
+        <translation type="unfinished">新樣板 %1</translation>
     </message>
     <message>
-        <source>Deadline</source>
-        <translation>到期日</translation>
+        <source>Click here to set the priority of new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter description of new task here.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>More</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Click here to enter additional information for new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to add new task.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to reset new task information.
+
+This area is called the quick task bar.
+
+It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Priority:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can not be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data can&apos;t be edited, currently syncing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TableView</name>
+    <message>
         <source>Table View</source>
         <translation>Table View</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 天</translation>
     </message>
 </context>
 <context>
-    <name>TaskEditorAdvanced</name>
+    <name>TaskEditorAlarms</name>
     <message>
-        <source>State:</source>
-        <translation>狀態：</translation>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Started</source>
-        <translation>已開始</translation>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Postponed</source>
-        <translation>已延期</translation>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finished</source>
-        <translation>已完成</translation>
+        <source>New</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not started</source>
-        <translation>尚未開始</translation>
+        <source>Edit</source>
+        <translation type="unfinished">編輯</translation>
     </message>
     <message>
-        <source>Maintainer</source>
-        <translation>負責人</translation>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorOverView</name>
     <message>
-        <source>test</source>
-        <translation>測試</translation>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>...</source>
-        <translation>...</translation>
+        <source>Enter brief description of the task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maintain Mode:</source>
-        <translation>責任歸屬：</translation>
+        <source>Complete </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Responsible</source>
-        <translation>由其負責</translation>
+        <source>Work on </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Done By</source>
-        <translation>由其完成</translation>
+        <source>Buy </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Coordinating</source>
-        <translation>由其協調</translation>
+        <source>Organize </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nothing</source>
-        <translation>無</translation>
+        <source>Get </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAdvancedImpl</name>
     <message>
-        <source>Description</source>
-        <translation>細節說明</translation>
+        <source>Update </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorAlarms</name>
     <message>
-        <source>empty</source>
-        <translation>無</translation>
+        <source>Create </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Add</source>
-        <translation>&amp;新增</translation>
+        <source>Plan </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Edit</source>
-        <translation>&amp;編輯</translation>
+        <source>Call </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;移除</translation>
+        <source>Mail </source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorOverView</name>
     <message>
-        <source>Form1</source>
-        <translation>表格 1</translation>
+        <source>Select priority of task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Priority</source>
-        <translation>優先順序</translation>
+        <source>Very High</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 - Very High</source>
-        <translation>1 - 非常高</translation>
+        <source>High</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 - High</source>
-        <translation>2 - 高</translation>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 - Normal</source>
-        <translation>3 - 普通</translation>
+        <source>Low</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>4 - Low</source>
-        <translation>4 - 低</translation>
+        <source>Very Low</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>5 - Very Low</source>
-        <translation>5 - 非常低</translation>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Progress</source>
-        <translation>進度</translation>
+        <source>Select category to organize this task with.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>0 %</source>
-        <translation>0 %</translation>
+        <source>Recurring task</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>20 %</source>
-        <translation>20 %</translation>
+        <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>40 %</source>
-        <translation>40 %</translation>
+        <source>Enter any additional information about this task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>60 %</source>
-        <translation>60 %</translation>
+        <source>Todo List</source>
+        <translation type="unfinished">待辦事項清單</translation>
     </message>
     <message>
-        <source>80 %</source>
-        <translation>80 %</translation>
+        <source>Summary:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TaskEditorStatus</name>
     <message>
-        <source>100 %</source>
-        <translation>100 %</translation>
+        <source>Status:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Due Date:</source>
-        <translation>預定到期日：</translation>
+        <source>Click here to set the current status of this task.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 Januar 2002</source>
-        <translation>2002 年一月一日</translation>
+        <source>Started</source>
+        <translation type="unfinished">已開始</translation>
     </message>
     <message>
-        <source>Start Date:</source>
-        <translation>開始日期：</translation>
+        <source>Postponed</source>
+        <translation type="unfinished">已延期</translation>
     </message>
     <message>
-        <source>1 Januar 2001</source>
-        <translation>2001 年一月一日</translation>
+        <source>Finished</source>
+        <translation type="unfinished">已完成</translation>
     </message>
     <message>
-        <source>Summary</source>
-        <translation>概要</translation>
+        <source>Not started</source>
+        <translation type="unfinished">尚未開始</translation>
     </message>
     <message>
-        <source>Complete</source>
-        <translation>完成</translation>
+        <source>Progress:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>work on</source>
-        <translation>進行中</translation>
+        <source>Select progress made on this task here.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>buy</source>
-        <translation>購買</translation>
+        <source>0 %</source>
+        <translation type="unfinished">0 %</translation>
     </message>
     <message>
-        <source>organize</source>
-        <translation>組織</translation>
+        <source>20 %</source>
+        <translation type="unfinished">20 %</translation>
     </message>
     <message>
-        <source>get</source>
-        <translation>取得</translation>
+        <source>40 %</source>
+        <translation type="unfinished">40 %</translation>
     </message>
     <message>
-        <source>Update</source>
-        <translation>更新</translation>
+        <source>60 %</source>
+        <translation type="unfinished">60 %</translation>
     </message>
     <message>
-        <source>Create</source>
-        <translation>設計</translation>
+        <source>80 %</source>
+        <translation type="unfinished">80 %</translation>
     </message>
     <message>
-        <source>Plan</source>
-        <translation>計劃</translation>
+        <source>100 %</source>
+        <translation type="unfinished">100 %</translation>
     </message>
     <message>
-        <source>Call</source>
-        <translation>打電話</translation>
+        <source>Start Date:</source>
+        <translation type="unfinished">開始日期：</translation>
     </message>
     <message>
-        <source>Mail</source>
-        <translation>寫信</translation>
+        <source>Click here to set the date this task was started.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Completed Date</source>
-        <translation>完成日期：</translation>
+        <source>Due Date:</source>
+        <translation type="unfinished">預定到期日：</translation>
     </message>
     <message>
-        <source>Completed</source>
-        <translation>已完成</translation>
+        <source>Click here to set the date this task needs to be completed by.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category</source>
-        <translation>分類目錄</translation>
+        <source>Completed:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable Recurrance</source>
-        <translation>啟動週期性設定</translation>
+        <source>Click here to mark this task as completed.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TaskEditorOverViewImpl</name>
     <message>
-        <source>Todo List</source>
-        <translation>待辦事項清單</translation>
+        <source>Click here to set the date this task was completed.</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialog</name>
     <message>
-        <source>Template Editor</source>
-        <translation>樣板編輯器</translation>
+        <source>Maintainer Mode:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation>新增</translation>
+        <source>Click here to set the maintainer&apos;s role.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation>編輯</translation>
+        <source>Nothing</source>
+        <translation type="unfinished">無</translation>
     </message>
     <message>
-        <source>Remove</source>
-        <translation>移除</translation>
+        <source>Responsible</source>
+        <translation type="unfinished">由其負責</translation>
     </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
     <message>
-        <source>Name</source>
-        <translation>命名</translation>
+        <source>Done By</source>
+        <translation type="unfinished">由其完成</translation>
     </message>
     <message>
-        <source>New Template %1</source>
-        <translation>新樣板 %1</translation>
+        <source>Coordinating</source>
+        <translation type="unfinished">由其協調</translation>
     </message>
-</context>
-<context>
-    <name>TemplateEditor</name>
     <message>
-        <source>Configure Templates</source>
-        <translation>樣板管理</translation>
+        <source>Maintainer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is the name of the current task maintainer.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>test</source>
+        <translation type="unfinished">測試</translation>
+    </message>
+    <message>
+        <source>Click here to select the task maintainer.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/ubrowser.ts b/i18n/zh_TW/ubrowser.ts
new file mode 100644
index 0000000..f3079ca
--- a/dev/null
+++ b/i18n/zh_TW/ubrowser.ts
@@ -0,0 +1,36 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainView</name>
+    <message>
+        <source>uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - uBrowser</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IP-Address not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error creating socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error connecting to socket</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/usermanager.ts b/i18n/zh_TW/usermanager.ts
index b0cf5d2..111e5ae 100644
--- a/i18n/zh_TW/usermanager.ts
+++ b/i18n/zh_TW/usermanager.ts
@@ -1,31 +1,35 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
         <translation>新增群組</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>編輯群組</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>OPIE User Manager</source>
-        <translation>OPIE 使用者管理員</translation>
+        <translation type="obsolete">OPIE 使用者管理員</translation>
+    </message>
+    <message>
+        <source>Opie User Manager</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>新增使用者</translation>
     </message>
     <message>
         <source>Edit User</source>
         <translation>編輯使用者</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/wordgame.ts b/i18n/zh_TW/wordgame.ts
index 7b79f74..f5bd88d 100644
--- a/i18n/zh_TW/wordgame.ts
+++ b/i18n/zh_TW/wordgame.ts
@@ -1,137 +1,133 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Board</name>
     <message>
         <source>Blanks: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown word</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The word &quot;%1&quot; is not in the dictionary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewGameBase</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Players</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AI3: Smart AI player</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RulesBase</name>
     <message>
         <source>Game Rules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Board</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ScoreInfo</name>
     <message>
         <source>&lt;P&gt;Invalid move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Score: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WordGame</name>
     <message>
         <source>Word Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to end the game early?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>